1. 03 6月, 2019 1 次提交
    • L
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 1975b337
      Linus Torvalds 提交于
      Pull SCSI fixes from James Bottomley:
       "Six minor fixes to device drivers and one to the multipath alua
        handler.
      
        The most extensive fix is the zfcp port remove prevention one, but
        it's impact is only s390"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        scsi: libsas: delete sas port if expander discover failed
        scsi: libsas: only clear phy->in_shutdown after shutdown event done
        scsi: scsi_dh_alua: Fix possible null-ptr-deref
        scsi: smartpqi: properly set both the DMA mask and the coherent DMA mask
        scsi: zfcp: fix to prevent port_remove with pure auto scan LUNs (only sdevs)
        scsi: zfcp: fix missing zfcp_port reference put on -EBUSY from port_remove
        scsi: libcxgbi: add a check for NULL pointer in cxgbi_check_route()
      1975b337
  2. 02 6月, 2019 21 次提交
  3. 01 6月, 2019 7 次提交
    • L
      Merge tag 'nfsd-5.2-1' of git://linux-nfs.org/~bfields/linux · 3ab4436f
      Linus Torvalds 提交于
      Pull nfsd fix from Bruce Fields:
       "This reverts a minor fix which could cause us to treat conflicting NLM
        locks as nonconflicting.
      
        We have proper fix queued up for 5.3. In the meantime, a quick revert
        seems best for 5.2 and stable"
      
      * tag 'nfsd-5.2-1' of git://linux-nfs.org/~bfields/linux:
        Revert "lockd: Show pid of lockd for remote locks"
      3ab4436f
    • L
      Merge tag 'v5.2-rc2-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 · 41e7231f
      Linus Torvalds 提交于
      Pull cifs fixes from Steve French:
       "Four small smb3 fixes, one for stable"
      
      * tag 'v5.2-rc2-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6:
        CIFS: cifs_read_allocate_pages: don't iterate through whole page array on ENOMEM
        dfs_cache: fix a wrong use of kfree in flush_cache_ent()
        fs/cifs/smb2pdu.c: fix buffer free in SMB2_ioctl_free
        cifs: fix memory leak of pneg_inbuf on -EOPNOTSUPP ioctl case
      41e7231f
    • L
      Merge branch 'next-fixes-for-5.2-rc' of... · d266b3f5
      Linus Torvalds 提交于
      Merge branch 'next-fixes-for-5.2-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity
      
      Pull integrity subsystem fixes from Mimi Zohar:
       "Four bug fixes, none 5.2-specific, all marked for stable.
      
        The first two are related to the architecture specific IMA policy
        support. The other two patches, one is related to EVM signatures,
        based on additional hash algorithms, and the other is related to
        displaying the IMA policy"
      
      * 'next-fixes-for-5.2-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
        ima: show rules with IMA_INMASK correctly
        evm: check hash algorithm passed to init_desc()
        ima: fix wrong signed policy requirement when not appraising
        x86/ima: Check EFI_RUNTIME_SERVICES before using
      d266b3f5
    • L
      Merge tag 'for-linus-5.2b-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 8164c571
      Linus Torvalds 提交于
      Pull xen fixes from Juergen Gross:
       "One minor cleanup patch and a fix for handling of live migration when
        running as Xen guest"
      
      * tag 'for-linus-5.2b-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xenbus: Avoid deadlock during suspend due to open transactions
        xen/pvcalls: Remove set but not used variable
      8164c571
    • L
      Merge tag 's390-5.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 27a03b1a
      Linus Torvalds 提交于
      Pull s390 fixes from Heiko Carstens:
      
       - Farewell Martin Schwidefsky: add Martin to CREDITS and remove him
         from MAINTAINERS
      
       - Vasily Gorbik and Christian Borntraeger join as maintainers for s390
      
       - Fix locking bug in ctr(aes) and ctr(des) s390 specific ciphers
      
       - A rather large patch which fixes gcm-aes-s390 scatter gather handling
      
       - Fix zcrypt wrong dispatching for control domain CPRBs
      
       - Fix assignment of bus resources in PCI code
      
       - Fix structure definition for set PCI function
      
       - Fix one compile error and one compile warning seen when
         CONFIG_OPTIMIZE_INLINING is enabled
      
      * tag 's390-5.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        MAINTAINERS: add Vasily Gorbik and Christian Borntraeger for s390
        MAINTAINERS: Farewell Martin Schwidefsky
        s390/crypto: fix possible sleep during spinlock aquired
        s390/crypto: fix gcm-aes-s390 selftest failures
        s390/zcrypt: Fix wrong dispatching for control domain CPRBs
        s390/pci: fix assignment of bus resources
        s390/pci: fix struct definition for set PCI function
        s390: mark __cpacf_check_opcode() and cpacf_query_func() as __always_inline
        s390: add unreachable() to dump_fault_info() to fix -Wmaybe-uninitialized
      27a03b1a
    • L
      Merge tag 'pm-5.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 702c31e8
      Linus Torvalds 提交于
      Pull power management fixes from Rafael Wysocki:
       "These fix three issues in the system-wide suspend and hibernation area
        related to PCI device PM handling by suspend-to-idle, device wakeup
        optimizations and arbitrary differences between suspend and
        hiberantion.
      
        Specifics:
      
         - Modify the PCI bus type's PM code to avoid putting devices left by
           their drivers in D0 on purpose during suspend to idle into
           low-power states as doing that may confuse the system resume
           callbacks of the drivers in question (Rafael Wysocki).
      
         - Avoid checking ACPI wakeup configuration during system-wide suspend
           for suspended devices that do not use ACPI-based wakeup to allow
           them to stay in suspend more often (Rafael Wysocki).
      
         - The last phase of hibernation is analogous to system-wide suspend
           also because on platforms with ACPI it passes control to the
           platform firmware to complete the transision, so make it indicate
           that by calling pm_set_suspend_via_firmware() to allow the drivers
           that care about this to do the right thing (Rafael Wysocki)"
      
      * tag 'pm-5.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        PCI: PM: Avoid possible suspend-to-idle issue
        ACPI: PM: Call pm_set_suspend_via_firmware() during hibernation
        ACPI/PCI: PM: Add missing wakeup.flags.valid checks
      702c31e8
    • L
      Merge tag 'gcc-plugins-v5.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 72cea7ac
      Linus Torvalds 提交于
      Pull gcc-plugins fix from Kees Cook:
       "Handle unusual header environment, fixing a redefined macro error
        under a Darwin build host"
      
      * tag 'gcc-plugins-v5.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        gcc-plugins: Fix build failures under Darwin host
      72cea7ac
  4. 31 5月, 2019 11 次提交
    • L
      Merge tag 'spdx-5.2-rc3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 2f4c5334
      Linus Torvalds 提交于
      Pull yet more SPDX updates from Greg KH:
       "Here is another set of reviewed patches that adds SPDX tags to
        different kernel files, based on a set of rules that are being used to
        parse the comments to try to determine that the license of the file is
        "GPL-2.0-or-later" or "GPL-2.0-only". Only the "obvious" versions of
        these matches are included here, a number of "non-obvious" variants of
        text have been found but those have been postponed for later review
        and analysis.
      
        There is also a patch in here to add the proper SPDX header to a bunch
        of Kbuild files that we have missed in the past due to new files being
        added and forgetting that Kbuild uses two different file names for
        Makefiles. This issue was reported by the Kbuild maintainer.
      
        These patches have been out for review on the linux-spdx@vger mailing
        list, and while they were created by automatic tools, they were
        hand-verified by a bunch of different people, all whom names are on
        the patches are reviewers"
      
      * tag 'spdx-5.2-rc3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (82 commits)
        treewide: Add SPDX license identifier - Kbuild
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 225
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 224
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 223
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 222
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 221
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 220
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 218
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 217
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 216
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 215
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 214
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 213
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 211
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 210
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 209
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 207
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 206
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 203
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 201
        ...
      2f4c5334
    • L
      Merge tag 'staging-5.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 2209a305
      Linus Torvalds 提交于
      Pull staging and IIO driver fixes from Greg KH:
       "Here are some Staging and IIO driver fixes to resolve some reported
        problems for 5.2-rc3.
      
        Nothing major here, just some tiny changes, full details are in the
        shortlog.
      
        All have been in linux-next for a while with no reported issues"
      
      * tag 'staging-5.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        staging: kpc2000: Add dependency on MFD_CORE to kconfig symbol 'KPC2000'
        staging: wilc1000: Fix some double unlock bugs in wilc_wlan_cleanup()
        staging: vc04_services: prevent integer overflow in create_pagelist()
        Staging: vc04_services: Fix a couple error codes
        staging: wlan-ng: fix adapter initialization failure
        staging: kpc2000: double unlock in error handling in kpc_dma_transfer()
        staging: kpc2000: Fix build error without CONFIG_UIO
        staging: kpc2000: fix build error on xtensa
        staging: erofs: set sb->s_root to NULL when failing from __getname()
        iio: adc: ti-ads8688: fix timestamp is not updated in buffer
        iio: dac: ds4422/ds4424 fix chip verification
        iio: imu: mpu6050: Fix FIFO layout for ICM20602
        iio: adc: ads124: avoid buffer overflow
        iio: adc: modify NPCM ADC read reference voltage
      2209a305
    • L
      Merge tag 'tty-5.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · dbde71df
      Linus Torvalds 提交于
      Pull tty/serial driver fixes from Greg KH:
       "Here are some small serial and TTY driver fixes for 5.2-rc3.
      
        Nothing major, just a number of fixes for reported issues. The fbcon
        core fix also resolves an issue, and was acked by the relevant
        maintainer to go through this tree.
      
        All of these have been in linux-next with no reported issues"
      
      * tag 'tty-5.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        vt/fbcon: deinitialize resources in visual_init() after failed memory allocation
        tty: max310x: Fix external crystal register setup
        serial: sh-sci: disable DMA for uart_console
        serial: imx: remove log spamming error message
        tty: serial: msm_serial: Fix XON/XOFF
      dbde71df
    • L
      Merge tag 'usb-5.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · e49c8547
      Linus Torvalds 提交于
      Pull USB fixes from Greg KH:
       "Here are some tiny USB fixes for a number of reported issues for
        5.2-rc3.
      
        Nothing huge here, just a small collection of xhci and other driver
        bugs that syzbot has been finding in some drivers. There is also a
        usbip fix and a fix for the usbip fix in here :)
      
        All have been in linux-next with no reported issues"
      
      * tag 'usb-5.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        usbip: usbip_host: fix stub_dev lock context imbalance regression
        media: smsusb: better handle optional alignment
        xhci: Use %zu for printing size_t type
        xhci: Convert xhci_handshake() to use readl_poll_timeout_atomic()
        xhci: Fix immediate data transfer if buffer is already DMA mapped
        usb: xhci: avoid null pointer deref when bos field is NULL
        usb: xhci: Fix a potential null pointer dereference in xhci_debugfs_create_endpoint()
        xhci: update bounce buffer with correct sg num
        media: usb: siano: Fix false-positive "uninitialized variable" warning
        USB: rio500: update Documentation
        USB: rio500: simplify locking
        USB: rio500: fix memory leak in close after disconnect
        USB: rio500: refuse more than one device at a time
        usbip: usbip_host: fix BUG: sleeping function called from invalid context
        USB: sisusbvga: fix oops in error path of sisusb_probe
        USB: Add LPM quirk for Surface Dock GigE adapter
        media: usb: siano: Fix general protection fault in smsusb
        usb: mtu3: fix up undefined reference to usb_debug_root
        USB: Fix slab-out-of-bounds write in usb_get_bos_descriptor
      e49c8547
    • L
      Merge tag 'drm-fixes-2019-05-31' of git://anongit.freedesktop.org/drm/drm · ca191804
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Nothing too crazy, pretty quiet, maybe too quiet.
      
        amdgpu:
         - a fixed version of the raven firmware fix we previously reverted
         - stolen memory fix
      
        imx:
         - regression fix
      
        qxl:
         - remove a bad warning
      
        etnaviv:
         - VM locking fix"
      
      * tag 'drm-fixes-2019-05-31' of git://anongit.freedesktop.org/drm/drm:
        drm/amdgpu: reserve stollen vram for raven series
        drm/etnaviv: lock MMU while dumping core
        drm/imx: ipuv3-plane: fix atomic update status query for non-plus i.MX6Q
        drm/qxl: drop WARN_ONCE()
        drm/amd/display: Don't load DMCU for Raven 1 (v2)
      ca191804
    • B
      Revert "lockd: Show pid of lockd for remote locks" · 141731d1
      Benjamin Coddington 提交于
      This reverts most of commit b8eee0e9 ("lockd: Show pid of lockd for
      remote locks"), which caused remote locks to not be differentiated between
      remote processes for NLM.
      
      We retain the fixup for setting the client's fl_pid to a negative value.
      
      Fixes: b8eee0e9 ("lockd: Show pid of lockd for remote locks")
      Cc: stable@vger.kernel.org
      Signed-off-by: NBenjamin Coddington <bcodding@redhat.com>
      Reviewed-by: NXueWei Zhang <xueweiz@google.com>
      Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>
      141731d1
    • H
      MAINTAINERS: add Vasily Gorbik and Christian Borntraeger for s390 · 674459be
      Heiko Carstens 提交于
      Add Vasily Gorbik and Christian Borntraeger as additional maintainers
      for s390.
      Acked-by: NVasily Gorbik <gor@linux.ibm.com>
      Acked-by: NChristian Borntraeger <borntraeger@de.ibm.com>
      Signed-off-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      674459be
    • H
      MAINTAINERS: Farewell Martin Schwidefsky · 2850ef62
      Heiko Carstens 提交于
      After two decades of significant contributions to the s390
      architecture, we must say goodbye to our dear colleague.
      
      Blue skies, Martin!
      Signed-off-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      2850ef62
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 036e3431
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) Fix OOPS during nf_tables rule dump, from Florian Westphal.
      
       2) Use after free in ip_vs_in, from Yue Haibing.
      
       3) Fix various kTLS bugs (NULL deref during device removal resync,
          netdev notification ignoring, etc.) From Jakub Kicinski.
      
       4) Fix ipv6 redirects with VRF, from David Ahern.
      
       5) Memory leak fix in igmpv3_del_delrec(), from Eric Dumazet.
      
       6) Missing memory allocation failure check in ip6_ra_control(), from
          Gen Zhang. And likewise fix ip_ra_control().
      
       7) TX clean budget logic error in aquantia, from Igor Russkikh.
      
       8) SKB leak in llc_build_and_send_ui_pkt(), from Eric Dumazet.
      
       9) Double frees in mlx5, from Parav Pandit.
      
      10) Fix lost MAC address in r8169 during PCI D3, from Heiner Kallweit.
      
      11) Fix botched register access in mvpp2, from Antoine Tenart.
      
      12) Use after free in napi_gro_frags(), from Eric Dumazet.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (89 commits)
        net: correct zerocopy refcnt with udp MSG_MORE
        ethtool: Check for vlan etype or vlan tci when parsing flow_rule
        net: don't clear sock->sk early to avoid trouble in strparser
        net-gro: fix use-after-free read in napi_gro_frags()
        net: dsa: tag_8021q: Create a stable binary format
        net: dsa: tag_8021q: Change order of rx_vid setup
        net: mvpp2: fix bad MVPP2_TXQ_SCHED_TOKEN_CNTR_REG queue value
        ipv4: tcp_input: fix stack out of bounds when parsing TCP options.
        mlxsw: spectrum: Prevent force of 56G
        mlxsw: spectrum_acl: Avoid warning after identical rules insertion
        net: dsa: mv88e6xxx: fix handling of upper half of STATS_TYPE_PORT
        r8169: fix MAC address being lost in PCI D3
        net: core: support XDP generic on stacked devices.
        netvsc: unshare skb in VF rx handler
        udp: Avoid post-GRO UDP checksum recalculation
        net: phy: dp83867: Set up RGMII TX delay
        net: phy: dp83867: do not call config_init twice
        net: phy: dp83867: increase SGMII autoneg timer duration
        net: phy: dp83867: fix speed 10 in sgmii mode
        net: phy: marvell10g: report if the PHY fails to boot firmware
        ...
      036e3431
    • L
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · adc3f554
      Linus Torvalds 提交于
      Pull arm64 fixes from Will Deacon:
       "The fixes are still trickling in for arm64, but the only really
        significant one here is actually fixing a regression in the botched
        module relocation range checking merged for -rc2.
      
        Hopefully we've nailed it this time.
      
         - Fix implementation of our set_personality() system call, which
           wasn't being wrapped properly
      
         - Fix system call function types to keep CFI happy
      
         - Fix siginfo layout when delivering SIGKILL after a kernel fault
      
         - Really fix module relocation range checking"
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: use the correct function type for __arm64_sys_ni_syscall
        arm64: use the correct function type in SYSCALL_DEFINE0
        arm64: fix syscall_fn_t type
        signal/arm64: Use force_sig not force_sig_fault for SIGKILL
        arm64/module: revert to unsigned interpretation of ABS16/32 relocations
        arm64: Fix the arm64_personality() syscall wrapper redirection
      adc3f554
    • L
      Merge tag 'for-5.2-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux · 318adf8e
      Linus Torvalds 提交于
      Pull btrfs fixes from David Sterba:
       "A few more fixes for bugs reported by users, fuzzing tools and
        regressions:
      
         - fix crashes in relocation:
             + resuming interrupted balance operation does not properly clean
               up orphan trees
             + with enabled qgroups, resuming needs to be more careful about
               block groups due to limited context when updating qgroups
      
         - fsync and logging fixes found by fuzzing
      
         - incremental send fixes for no-holes and clone
      
         - fix spin lock type used in timer function for zstd"
      
      * tag 'for-5.2-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
        Btrfs: fix race updating log root item during fsync
        Btrfs: fix wrong ctime and mtime of a directory after log replay
        Btrfs: fix fsync not persisting changed attributes of a directory
        btrfs: qgroup: Check bg while resuming relocation to avoid NULL pointer dereference
        btrfs: reloc: Also queue orphan reloc tree for cleanup to avoid BUG_ON()
        Btrfs: incremental send, fix emission of invalid clone operations
        Btrfs: incremental send, fix file corruption when no-holes feature is enabled
        btrfs: correct zstd workspace manager lock to use spin_lock_bh()
        btrfs: Ensure replaced device doesn't have pending chunk allocation
      318adf8e