1. 18 1月, 2019 3 次提交
  2. 14 1月, 2019 9 次提交
    • L
      Linux 5.0-rc2 · 1c7fc5cb
      Linus Torvalds 提交于
      1c7fc5cb
    • J
      kernel/sys.c: Clarify that UNAME26 does not generate unique versions anymore · b7285b42
      Jonathan Neuschäfer 提交于
      UNAME26 is a mechanism to report Linux's version as 2.6.x, for
      compatibility with old/broken software.  Due to the way it is
      implemented, it would have to be updated after 5.0, to keep the
      resulting versions unique.  Linus Torvalds argued:
      
       "Do we actually need this?
      
        I'd rather let it bitrot, and just let it return random versions. It
        will just start again at 2.4.60, won't it?
      
        Anybody who uses UNAME26 for a 5.x kernel might as well think it's
        still 4.x. The user space is so old that it can't possibly care about
        differences between 4.x and 5.x, can it?
      
        The only thing that matters is that it shows "2.4.<largeenough>",
        which it will do regardless"
      Signed-off-by: NJonathan Neuschäfer <j.neuschaefer@gmx.net>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      b7285b42
    • L
      Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · dbc3c09b
      Linus Torvalds 提交于
      Pull ARM SoC fixes from Olof Johansson:
       "A bigger batch than I anticipated this week, for two reasons:
      
         - Some fallout on Davinci from board file -> DTB conversion, that
           also includes a few longer-standing fixes (i.e. not recent
           regressions).
      
         - drivers/reset material that has been in linux-next for a while, but
           didn't get sent to us until now for a variety of reasons
           (maintainer out sick, holidays, etc). There's a functional
           dependency in there such that one platform (Altera's SoCFPGA) won't
           boot without one of the patches; instead of reverting the patch
           that got merged, I looked at this set and decided it was small
           enough that I'll pick it up anyway. If you disagree I can revisit
           with a smaller set.
      
        That being said, there's also a handful of the usual stuff:
      
         - Fix for a crash on Armada 7K/8K when the kernel touches
           PSCI-reserved memory
      
         - Fix for PCIe reset on Macchiatobin (Armada 8K development board,
           what this email is sent from in fact :)
      
         - Enable a few new-merged modules for Amlogic in arm64 defconfig
      
         - Error path fixes on Integrator
      
         - Build fix for Renesas and Qualcomm
      
         - Initialization fix for Renesas RZ/G2E
      
        .. plus a few more fixlets"
      
      * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits)
        ARM: integrator: impd1: use struct_size() in devm_kzalloc()
        qcom-scm: Include <linux/err.h> header
        gpio: pl061: handle failed allocations
        ARM: dts: kirkwood: Fix polarity of GPIO fan lines
        arm64: dts: marvell: mcbin: fix PCIe reset signal
        arm64: dts: marvell: armada-ap806: reserve PSCI area
        ARM: dts: da850-lcdk: Correct the sound card name
        ARM: dts: da850-lcdk: Correct the audio codec regulators
        ARM: dts: da850-evm: Correct the sound card name
        ARM: dts: da850-evm: Correct the audio codec regulators
        ARM: davinci: omapl138-hawk: fix label names in GPIO lookup entries
        ARM: davinci: dm644x-evm: fix label names in GPIO lookup entries
        ARM: davinci: dm355-evm: fix label names in GPIO lookup entries
        ARM: davinci: da850-evm: fix label names in GPIO lookup entries
        ARM: davinci: da830-evm: fix label names in GPIO lookup entries
        arm64: defconfig: enable modules for amlogic s400 sound card
        reset: uniphier-glue: Add AHCI reset control support in glue layer
        dt-bindings: reset: uniphier: Add AHCI core reset description
        reset: uniphier-usb3: Rename to reset-uniphier-glue
        dt-bindings: reset: uniphier: Replace the expression of USB3 with generic peripherals
        ...
      dbc3c09b
    • L
      Merge tag 'for-5.0-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux · 6b529fb0
      Linus Torvalds 提交于
      Pull btrfs fixes from David Sterba:
      
       - two regression fixes in clone/dedupe ioctls, the generic check
         callback needs to lock extents properly and wait for io to avoid
         problems with writeback and relocation
      
       - fix deadlock when using free space tree due to block group creation
      
       - a recently added check refuses a valid fileystem with seeding device,
         make that work again with a quickfix, proper solution needs more
         intrusive changes
      
      * tag 'for-5.0-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
        btrfs: Use real device structure to verify dev extent
        Btrfs: fix deadlock when using free space tree due to block group creation
        Btrfs: fix race between reflink/dedupe and relocation
        Btrfs: fix race between cloning range ending at eof and writeback
      6b529fb0
    • L
      Merge tag 'driver-core-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 72d657dd
      Linus Torvalds 提交于
      Pull driver core fixes from Greg KH:
       "Here is one small sysfs change, and a documentation update for 5.0-rc2
      
        The sysfs change moves from using BUG_ON to WARN_ON, as discussed in
        an email thread on lkml while trying to track down another driver bug.
        sysfs should not be crashing and preventing people from seeing where
        they went wrong. Now it properly recovers and warns the developer.
      
        The documentation update removes the use of BUS_ATTR() as the kernel
        is moving away from this to use the specific BUS_ATTR_RW() and friends
        instead. There are pending patches in all of the different subsystems
        to remove the last users of this macro, but for now, don't advertise
        it should be used anymore to keep new ones from being introduced.
      
        Both have been in linux-next with no reported issues"
      
      * tag 'driver-core-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        Documentation: driver core: remove use of BUS_ATTR
        sysfs: convert BUG_ON to WARN_ON
      72d657dd
    • L
      Merge tag 'staging-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · f7c1038b
      Linus Torvalds 提交于
      Pull staging driver fixes from Greg KH:
       "Here are some small staging driver fixes for some reported issues.
      
        One reverts a patch that was made to the rtl8723bs driver that turned
        out to not be needed at all as it was a bug in clang. The others fix
        up some reported issues in the rtl8188eu driver and update the
        MAINTAINERS file to point to Larry for this driver so he can get the
        bug reports easier.
      
        All have been in linux-next with no reported issues"
      
      * tag 'staging-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        Revert "staging: rtl8723bs: Mark ACPI table declaration as used"
        staging: rtl8188eu: Fix module loading from tasklet for WEP encryption
        staging: rtl8188eu: Fix module loading from tasklet for CCMP encryption
        MAINTAINERS: Add entry for staging driver r8188eu
      f7c1038b
    • L
      Merge tag 'tty-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 437e878a
      Linus Torvalds 提交于
      Pull tty/serial fixes from Greg KH:
       "Here are 2 tty and serial fixes for 5.0-rc2 that resolve some reported
        issues.
      
        The first is a simple serial driver fix for a regression that showed
        up in 5.0-rc1. The second one resolves a number of reported issues
        with the recent tty locking fixes that went into 5.0-rc1. Lots of
        people have tested the second one and say it resolves their issues.
      
        Both have been in linux-next with no reported issues"
      
      * tag 'tty-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        tty: Don't hold ldisc lock in tty_reopen() if ldisc present
        serial: lantiq: Do not swap register read/writes
      437e878a
    • L
      Merge tag 'usb-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 1dd8a3f6
      Linus Torvalds 提交于
      Pull USB fixes from Greg KH:
       "Here are some small USB driver fixes and quirk updates for 5.0-rc2.
      
        The majority here are some quirks for some storage devices to get them
        to work properly. There's also a fix here to resolve the reported
        issues with some audio devices that say they are UAC3 compliant, but
        really are not.
      
        And a fix up for the MAINTAINERS file to remove a dead url.
      
        All have been in linux-next with no reported issues"
      
      * tag 'usb-5.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        usb: storage: Remove outdated URL from MAINTAINERS
        USB: Add USB_QUIRK_DELAY_CTRL_MSG quirk for Corsair K70 RGB
        usbcore: Select only first configuration for non-UAC3 compliant devices
        USB: storage: add quirk for SMI SM3350
        USB: storage: don't insert sane sense for SPC3+ when bad sense specified
        usb: cdc-acm: send ZLP for Telit 3G Intel based modems
      1dd8a3f6
    • L
      Merge tag '5.0-rc1-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 · 0f9d140a
      Linus Torvalds 提交于
      Pull cifs fixes from Steve French:
       "A set of cifs/smb3 fixes, 4 for stable, most from Pavel. His patches
        fix an important set of crediting (flow control) problems, and also
        two problems in cifs_writepages, ddressing some large i/o and also
        compounding issues"
      
      * tag '5.0-rc1-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: update internal module version number
        CIFS: Fix error paths in writeback code
        CIFS: Move credit processing to mid callbacks for SMB3
        CIFS: Fix credits calculation for cancelled requests
        cifs: Fix potential OOB access of lock element array
        cifs: Limit memory used by lock request calls to a page
        cifs: move large array from stack to heap
        CIFS: Do not hide EINTR after sending network packets
        CIFS: Fix credit computation for compounded requests
        CIFS: Do not set credits to 1 if the server didn't grant anything
        CIFS: Fix adjustment of credits for MTU requests
        cifs: Fix a tiny potential memory leak
        cifs: Fix a debug message
      0f9d140a
  3. 13 1月, 2019 12 次提交
    • O
      Merge tag 'reset-for-5.0-rc2' of git://git.pengutronix.de/git/pza/linux into fixes · 46561217
      Olof Johansson 提交于
      Late reset controller changes for v5.0
      
      This adds missing deassert functionality to the ARC HSDK reset driver,
      fixes some indentation and grammar issues in the kernel docs, adds a
      helper to count the number of resets on a device for the non-DT case
      as well, adds an early reset driver for SoCFPGA and simple reset driver
      support for Stratix10, and generalizes the uniphier USB3 glue layer
      reset to also cover AHCI.
      
      * tag 'reset-for-5.0-rc2' of git://git.pengutronix.de/git/pza/linux:
        reset: uniphier-glue: Add AHCI reset control support in glue layer
        dt-bindings: reset: uniphier: Add AHCI core reset description
        reset: uniphier-usb3: Rename to reset-uniphier-glue
        dt-bindings: reset: uniphier: Replace the expression of USB3 with generic peripherals
        ARM: socfpga: dts: document "altr,stratix10-rst-mgr" binding
        reset: socfpga: add an early reset driver for SoCFPGA
        reset: fix null pointer dereference on dev by dev_name
        reset: Add reset_control_get_count()
        reset: Improve reset controller kernel docs
        ARC: HSDK: improve reset driver
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      46561217
    • O
      Merge tag 'mvebu-fixes-5.0-1' of git://git.infradead.org/linux-mvebu into fixes · 56acb3ef
      Olof Johansson 提交于
      mvebu fixes for 5.0
      
      They are all device tree fixes which also worth being in stable:
      
       - Reserve PSCI area on Armada 7K/8K preventing the kernel accessing
         this area and crashing while doing it.
      
       - Use correct PCIe reset signal on MACCHIATOBin  (Armada 8040 based)
      
       - Fix polarity of GPIO fan line D-Link DNS NASes(kikwood based)
      
      * tag 'mvebu-fixes-5.0-1' of git://git.infradead.org/linux-mvebu:
        ARM: dts: kirkwood: Fix polarity of GPIO fan lines
        arm64: dts: marvell: mcbin: fix PCIe reset signal
        arm64: dts: marvell: armada-ap806: reserve PSCI area
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      56acb3ef
    • O
      Merge tag 'integrator-fixes-armsoc' of... · 2ec472ed
      Olof Johansson 提交于
      Merge tag 'integrator-fixes-armsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into fixes
      
      Fixes for the Integrator:
      - Handle failed allocations in the IM/PC bus attachment.
      - Use struct_size() for allocation.
      
      * tag 'integrator-fixes-armsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
        ARM: integrator: impd1: use struct_size() in devm_kzalloc()
        gpio: pl061: handle failed allocations
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      2ec472ed
    • O
      Merge tag 'amlogic-fixes' of... · 431a8b73
      Olof Johansson 提交于
      Merge tag 'amlogic-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into fixes
      
      Amlogic DT fixes for v5.0-rc
      - arm64: defconfig: enable modules for amlogic s400 sound card
      
      * tag 'amlogic-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
        arm64: defconfig: enable modules for amlogic s400 sound card
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      431a8b73
    • O
      Merge tag 'qcom-fixes-for-5.0-rc1' of... · f4f8aa6d
      Olof Johansson 提交于
      Merge tag 'qcom-fixes-for-5.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into fixes
      
      Qualcomm Driver Fixes for 5.0-rc1
      
      * Add required includes into qcom_scm.h
      
      * tag 'qcom-fixes-for-5.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
        qcom-scm: Include <linux/err.h> header
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      f4f8aa6d
    • O
      Merge tag 'davinci-fixes-for-v5.0' of... · 98a5f673
      Olof Johansson 提交于
      Merge tag 'davinci-fixes-for-v5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes
      
      This pull request fixes some more regressions on legacy
      DaVinci board support due to GPIO driver clean-up introduced
      in v4.20 kernel. These are marked for stable.
      
      Also has fixes for some long standing Audio issues on DA850
      boards.
      
      * tag 'davinci-fixes-for-v5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
        ARM: dts: da850-lcdk: Correct the sound card name
        ARM: dts: da850-lcdk: Correct the audio codec regulators
        ARM: dts: da850-evm: Correct the sound card name
        ARM: dts: da850-evm: Correct the audio codec regulators
        ARM: davinci: omapl138-hawk: fix label names in GPIO lookup entries
        ARM: davinci: dm644x-evm: fix label names in GPIO lookup entries
        ARM: davinci: dm355-evm: fix label names in GPIO lookup entries
        ARM: davinci: da850-evm: fix label names in GPIO lookup entries
        ARM: davinci: da830-evm: fix label names in GPIO lookup entries
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      98a5f673
    • O
      Merge tag 'renesas-fixes-for-v5.0' of... · 70bf439a
      Olof Johansson 提交于
      Merge tag 'renesas-fixes-for-v5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
      
      Renesas ARM Based SoC Fixes for v5.0
      
      Renesas SoCs:
      * Fix build regressions caused by move of Kconfig symbols
      
      RZ/G2E (r8a774c0) SoC:
      * Correct initialization order of 3DG-{A,B} in SYSC driver
      
      * tag 'renesas-fixes-for-v5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        soc: renesas: r8a774c0-sysc: Fix initialization order of 3DG-{A,B}
        ARM: shmobile: fix build regressions
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      70bf439a
    • J
      phy: fix build breakage: add PHY_MODE_SATA · e1706720
      John Hubbard 提交于
      Commit 49e54187 ("ata: libahci_platform: comply to PHY framework") uses
      the PHY_MODE_SATA, but that enum had not yet been added. This caused a
      build failure for me, with today's linux.git.
      
      Also, there is a potentially conflicting (mis-named) PHY_MODE_SATA, hiding
      in the Marvell Berlin SATA PHY driver.
      
      Fix the build by:
      
          1) Renaming Marvell's defined value to a more scoped name,
             in order to avoid any potential conflicts: PHY_BERLIN_MODE_SATA.
      
          2) Adding the missing enum, which was going to be added anyway as part
             of [1].
      
      [1] https://lkml.kernel.org/r/20190108163124.6409-3-miquel.raynal@bootlin.com
      
      Fixes: 49e54187 ("ata: libahci_platform: comply to PHY framework")
      Signed-off-by: NJohn Hubbard <jhubbard@nvidia.com>
      Acked-by: NJens Axboe <axboe@kernel.dk>
      Acked-by: NOlof Johansson <olof@lixom.net>
      Cc: Grzegorz Jaszczyk <jaz@semihalf.com>
      Cc: Miquel Raynal <miquel.raynal@bootlin.com>
      Cc: Hans de Goede <hdegoede@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e1706720
    • L
      Merge tag 'for-linus-20190112' of git://git.kernel.dk/linux-block · b8c3b899
      Linus Torvalds 提交于
      Pull block fixes from Jens Axboe:
      
       - NVMe pull request from Christoph, with little fixes all over the map
      
       - Loop caching fix for offset/bs change (Jaegeuk Kim)
      
       - Block documentation tweaks (Jeff, Jon, Weiping, John)
      
       - null_blk zoned tweak (John)
      
       - ahch mvebu suspend/resume support. Should have gone into the merge
         window, but there was some confusion on which tree had it. (Miquel)
      
      * tag 'for-linus-20190112' of git://git.kernel.dk/linux-block: (22 commits)
        ata: ahci: mvebu: request PHY suspend/resume for Armada 3700
        ata: ahci: mvebu: add Armada 3700 initialization needed for S2RAM
        ata: ahci: mvebu: do Armada 38x configuration only on relevant SoCs
        ata: ahci: mvebu: remove stale comment
        ata: libahci_platform: comply to PHY framework
        loop: drop caches if offset or block_size are changed
        block: fix kerneldoc comment for blk_attempt_plug_merge()
        nvme: don't initlialize ctrl->cntlid twice
        nvme: introduce NVME_QUIRK_IGNORE_DEV_SUBNQN
        nvme: pad fake subsys NQN vid and ssvid with zeros
        nvme-multipath: zero out ANA log buffer
        nvme-fabrics: unset write/poll queues for discovery controllers
        nvme-tcp: don't ask if controller is fabrics
        nvme-tcp: remove dead code
        nvme-pci: fix out of bounds access in nvme_cqe_pending
        nvme-pci: rerun irq setup on IO queue init errors
        nvme-pci: use the same attributes when freeing host_mem_desc_bufs.
        nvme-pci: fix the wrong setting of nr_maps
        block: doc: add slice_idle_us to bfq documentation
        block: clarify documentation for blk_{start|finish}_plug
        ...
      b8c3b899
    • L
      Merge tag 'remove-dma_zalloc_coherent-5.0' of git://git.infradead.org/users/hch/dma-mapping · 66c56cfa
      Linus Torvalds 提交于
      Pull dma_zalloc_coherent() removal from Christoph Hellwig:
       "We've always had a weird situation around dma_zalloc_coherent. To
        safely support mapping the allocations to userspace major
        architectures like x86 and arm have always zeroed allocations from
        dma_alloc_coherent, but a couple other architectures were missing that
        zeroing either always or in corner cases.
      
        Then later we grew anothe dma_zalloc_coherent interface to explicitly
        request zeroing, but that just added __GFP_ZERO to the allocation
        flags, which for some allocators that didn't end up using the page
        allocator ended up being a no-op and still not zeroing the
        allocations.
      
        So for this merge window I fixed up all remaining architectures to
        zero the memory in dma_alloc_coherent, and made dma_zalloc_coherent a
        no-op wrapper around dma_alloc_coherent, which fixes all of the above
        issues.
      
        dma_zalloc_coherent is now pointless and can go away, and Luis helped
        me writing a cocchinelle script and patch series to kill it, which I
        think we should apply now just after -rc1 to finally settle these
        issue"
      
      * tag 'remove-dma_zalloc_coherent-5.0' of git://git.infradead.org/users/hch/dma-mapping:
        dma-mapping: remove dma_zalloc_coherent()
        cross-tree: phase out dma_zalloc_coherent() on headers
        cross-tree: phase out dma_zalloc_coherent()
      66c56cfa
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 47334889
      Linus Torvalds 提交于
      Pull KVM fixes from Radim Krčmář:
       "Minor fixes for new code, corner cases, and documentation"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        x86/kvm/nVMX: don't skip emulated instruction twice when vmptr address is not backed
        Documentation/virtual/kvm: Update URL for AMD SEV API specification
        KVM/VMX: Avoid return error when flush tlb successfully in the hv_remote_flush_tlb_with_range()
        kvm: sev: Fail KVM_SEV_INIT if already initialized
        KVM: validate userspace input in kvm_clear_dirty_log_protect()
        KVM: x86: Fix bit shifting in update_intel_pt_cfg
      47334889
    • L
      Merge tag 'drm-fixes-2019-01-11-1' of git://anongit.freedesktop.org/drm/drm · 7b5c8f52
      Linus Torvalds 提交于
      Pull more drm fixes from Daniel Vetter:
       "Dave sends out his pull, everybody remembers holidays are over :-)
      
        Since Dave's already in weekend mode and it was quite a few patches I
        figured better to apply all the pulls and forward them to you. Hence
        here 2nd part of bugfixes for -rc2.
      
        nouveau:
         - backlight fix
         - falcon register access fix
         - fan fix.
      
        i915:
         - Disable PSR for Apple panels
         - Broxton ERR_PTR error state fix
         - Kabylake VECS workaround fix
         - Unwind failure on pinning the gen7 ppgtt
         - GVT workload request allocation fix
      
        core:
         - Fix fb-helper to work correctly with SDL 1.2 bugs
         - Fix lockdep warning in the atomic ioctl and setproperty"
      
      * tag 'drm-fixes-2019-01-11-1' of git://anongit.freedesktop.org/drm/drm:
        drm/nouveau/falcon: avoid touching registers if engine is off
        drm/nouveau: Don't disable polling in fallback mode
        drm/nouveau: register backlight on pascal and newer
        drm: Fix documentation generation for DP_DPCD_QUIRK_NO_PSR
        drm/i915: init per-engine WAs for all engines
        drm/i915: Unwind failure on pinning the gen7 ppgtt
        drm/i915: Skip the ERR_PTR error state
        drm/i915: Disable PSR in Apple panels
        gpu/drm: Fix lock held when returning to user space.
        drm/fb-helper: Ignore the value of fb_var_screeninfo.pixclock
        drm/fb-helper: Partially bring back workaround for bugs of SDL 1.2
        drm/i915/gvt: Fix workload request allocation before request add
      7b5c8f52
  4. 12 1月, 2019 16 次提交