Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI fixes from James Bottomley:
 "The most important one is the bfa fix because it's easy to oops the
  kernel with this driver (this includes the commit that corrects the
  compiler warning in the original), a regression in the new timespec
  conversion in aacraid and a regression in the Fibre Channel ELS
  handling patch.

  The other three are a theoretical problem with termination in the
  vendor/host matching code and a use after free in lpfc.

  The additional patches are a fix for an I/O hang in the mq code under
  certain circumstances and a rare oops in some debugging code"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: core: Fix a scsi_show_rq() NULL pointer dereference
  scsi: MAINTAINERS: change FCoE list to linux-scsi
  scsi: libsas: fix length error in sas_smp_handler()
  scsi: bfa: fix type conversion warning
  scsi: core: run queue if SCSI device queue isn't ready and queue is idle
  scsi: scsi_devinfo: cleanly zero-pad devinfo strings
  scsi: scsi_devinfo: handle non-terminated strings
  scsi: bfa: fix access to bfad_im_port_s
  scsi: aacraid: address UBSAN warning regression
  scsi: libfc: fix ELS request handling
  scsi: lpfc: Use after free in lpfc_rq_buf_free()

diff --combined MAINTAINERS
index 82ad0eabce4f3e3955dfab54c7df2cae03644268,37841b52a5b69c7ab416dd12b47463e8358813c6..e626cb622dca896a6cc4f9ab8eb26d45be798ff5
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -384,7 -384,6 +384,7 @@@ ACPI WMI DRIVE
  L:    platform-driver-x86@vger.kernel.org
  S:    Orphan
  F:    drivers/platform/x86/wmi.c
 +F:    include/uapi/linux/wmi.h
  
  AD1889 ALSA SOUND DRIVER
  M:    Thibaut Varene <T-Bone@parisc-linux.org>
@@@ -554,13 -553,13 +554,13 @@@ S:      Orpha
  F:    Documentation/filesystems/affs.txt
  F:    fs/affs/
  
 -AFS FILESYSTEM & AF_RXRPC SOCKET DOMAIN
 +AFS FILESYSTEM
  M:    David Howells <dhowells@redhat.com>
  L:    linux-afs@lists.infradead.org
  S:    Supported
  F:    fs/afs/
 -F:    include/net/af_rxrpc.h
 -F:    net/rxrpc/af_rxrpc.c
 +F:    include/trace/events/afs.h
 +F:    Documentation/filesystems/afs.txt
  W:    https://www.infradead.org/~dhowells/kafs/
  
  AGPGART DRIVER
@@@ -755,6 -754,8 +755,6 @@@ F: drivers/gpu/drm/amd/amdkfd
  F:    drivers/gpu/drm/amd/include/cik_structs.h
  F:    drivers/gpu/drm/amd/include/kgd_kfd_interface.h
  F:    drivers/gpu/drm/amd/include/vi_structs.h
 -F:    drivers/gpu/drm/radeon/radeon_kfd.c
 -F:    drivers/gpu/drm/radeon/radeon_kfd.h
  F:    include/uapi/linux/kfd_ioctl.h
  
  AMD SEATTLE DEVICE TREE SUPPORT
@@@ -859,8 -860,7 +859,8 @@@ F: kernel/configs/android
  ANDROID DRIVERS
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  M:    Arve Hjønnevåg <arve@android.com>
 -M:    Riley Andrews <riandrews@android.com>
 +M:    Todd Kjos <tkjos@android.com>
 +M:    Martijn Coenen <maco@android.com>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
  L:    devel@driverdev.osuosl.org
  S:    Supported
@@@ -1221,8 -1221,6 +1221,8 @@@ L:      linux-arm-kernel@lists.infradead.or
  W:    http://www.linux4sam.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
  S:    Supported
 +N:    at91
 +N:    atmel
  F:    arch/arm/mach-at91/
  F:    include/soc/at91/
  F:    arch/arm/boot/dts/at91*.dts
@@@ -1231,9 -1229,6 +1231,9 @@@ F:      arch/arm/boot/dts/sama*.dt
  F:    arch/arm/boot/dts/sama*.dtsi
  F:    arch/arm/include/debug/at91.S
  F:    drivers/memory/atmel*
 +F:    drivers/watchdog/sama5d4_wdt.c
 +X:    drivers/input/touchscreen/atmel_mxt_ts.c
 +X:    drivers/net/wireless/atmel/
  
  ARM/CALXEDA HIGHBANK ARCHITECTURE
  M:    Rob Herring <robh@kernel.org>
@@@ -1591,13 -1586,10 +1591,13 @@@ F:   drivers/rtc/rtc-armada38x.
  
  ARM/Mediatek RTC DRIVER
  M:    Eddie Huang <eddie.huang@mediatek.com>
 +M:    Sean Wang <sean.wang@mediatek.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 +F:    Documentation/devicetree/bindings/rtc/rtc-mt7622.txt
  F:    drivers/rtc/rtc-mt6397.c
 +F:    drivers/rtc/rtc-mt7622.c
  
  ARM/Mediatek SoC support
  M:    Matthias Brugger <matthias.bgg@gmail.com>
@@@ -1771,7 -1763,6 +1771,7 @@@ Q:      http://patchwork.kernel.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
  S:    Supported
  F:    arch/arm64/boot/dts/renesas/
 +F:    Documentation/devicetree/bindings/arm/shmobile.txt
  F:    drivers/soc/renesas/
  F:    include/linux/soc/renesas/
  
@@@ -1891,7 -1882,6 +1891,7 @@@ F:      arch/arm/boot/dts/sh
  F:    arch/arm/configs/shmobile_defconfig
  F:    arch/arm/include/debug/renesas-scif.S
  F:    arch/arm/mach-shmobile/
 +F:    Documentation/devicetree/bindings/arm/shmobile.txt
  F:    drivers/soc/renesas/
  F:    include/linux/soc/renesas/
  
@@@ -1966,14 -1956,6 +1966,14 @@@ M:    Lennert Buytenhek <kernel@wantstofly
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
 +ARM/TEGRA HDMI CEC SUBSYSTEM SUPPORT
 +M:    Hans Verkuil <hans.verkuil@cisco.com>
 +L:    linux-tegra@vger.kernel.org
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/platform/tegra-cec/
 +F:    Documentation/devicetree/bindings/media/tegra-cec.txt
 +
  ARM/TETON BGA MACHINE SUPPORT
  M:    "Mark F. Brown" <mark.brown314@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -2047,7 -2029,7 +2047,7 @@@ F:      arch/arm/boot/dts/uniphier
  F:    arch/arm/include/asm/hardware/cache-uniphier.h
  F:    arch/arm/mach-uniphier/
  F:    arch/arm/mm/cache-uniphier.c
 -F:    arch/arm64/boot/dts/socionext/
 +F:    arch/arm64/boot/dts/socionext/uniphier*
  F:    drivers/bus/uniphier-system-bus.c
  F:    drivers/clk/uniphier/
  F:    drivers/gpio/gpio-uniphier.c
@@@ -2151,6 -2133,7 +2151,6 @@@ F:      drivers/gpio/gpio-zx.
  F:    drivers/i2c/busses/i2c-zx2967.c
  F:    drivers/mmc/host/dw_mmc-zx.*
  F:    drivers/pinctrl/zte/
 -F:    drivers/reset/reset-zx2967.c
  F:    drivers/soc/zte/
  F:    drivers/thermal/zx2967_thermal.c
  F:    drivers/watchdog/zx2967_wdt.c
@@@ -2173,6 -2156,7 +2173,6 @@@ F:      sound/soc/zte
  
  ARM/ZYNQ ARCHITECTURE
  M:    Michal Simek <michal.simek@xilinx.com>
 -R:    Sören Brinkmann <soren.brinkmann@xilinx.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://wiki.xilinx.com
  T:    git https://github.com/Xilinx/linux-xlnx.git
@@@ -2947,7 -2931,6 +2947,7 @@@ N:      bcm583
  N:    bcm585*
  N:    bcm586*
  N:    bcm88312
 +N:    hr2
  F:    arch/arm64/boot/dts/broadcom/ns2*
  F:    drivers/clk/bcm/clk-ns*
  F:    drivers/pinctrl/bcm/pinctrl-ns*
@@@ -2991,14 -2974,6 +2991,14 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt
  F:    drivers/cpufreq/brcmstb*
  
 +BROADCOM STB AVS TMON DRIVER
 +M:    Markus Mayer <mmayer@broadcom.com>
 +M:    bcm-kernel-feedback-list@broadcom.com
 +L:    linux-pm@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/thermal/brcm,avs-tmon.txt
 +F:    drivers/thermal/broadcom/brcmstb*
 +
  BROADCOM STB NAND FLASH DRIVER
  M:    Brian Norris <computersforpeace@gmail.com>
  M:    Kamal Dasu <kdasu.kdev@gmail.com>
@@@ -3007,14 -2982,6 +3007,14 @@@ L:    bcm-kernel-feedback-list@broadcom.co
  S:    Maintained
  F:    drivers/mtd/nand/brcmnand/
  
 +BROADCOM STB DPFE DRIVER
 +M:    Markus Mayer <mmayer@broadcom.com>
 +M:    bcm-kernel-feedback-list@broadcom.com
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.txt
 +F:    drivers/memory/brcmstb_dpfe.c
 +
  BROADCOM SYSTEMPORT ETHERNET DRIVER
  M:    Florian Fainelli <f.fainelli@gmail.com>
  L:    netdev@vger.kernel.org
@@@ -3297,15 -3264,6 +3297,15 @@@ F:    include/uapi/linux/cec.
  F:    include/uapi/linux/cec-funcs.h
  F:    Documentation/devicetree/bindings/media/cec.txt
  
 +CEC GPIO DRIVER
 +M:    Hans Verkuil <hans.verkuil@cisco.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Supported
 +F:    drivers/media/platform/cec-gpio/
 +F:    Documentation/devicetree/bindings/media/cec-gpio.txt
 +
  CELL BROADBAND ENGINE ARCHITECTURE
  M:    Arnd Bergmann <arnd@arndb.de>
  L:    linuxppc-dev@lists.ozlabs.org
@@@ -3733,8 -3691,8 +3733,8 @@@ F:      drivers/cpuidle/
  F:    include/linux/cpuidle.h
  
  CRAMFS FILESYSTEM
 -W:    http://sourceforge.net/projects/cramfs/
 -S:    Orphan / Obsolete
 +M:    Nicolas Pitre <nico@linaro.org>
 +S:    Maintained
  F:    Documentation/filesystems/cramfs.txt
  F:    fs/cramfs/
  
@@@ -4035,26 -3993,6 +4035,26 @@@ M:    "Maciej W. Rozycki" <macro@linux-mip
  S:    Maintained
  F:    drivers/net/fddi/defxx.*
  
 +DELL SMBIOS DRIVER
 +M:    Pali Rohár <pali.rohar@gmail.com>
 +M:    Mario Limonciello <mario.limonciello@dell.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/x86/dell-smbios.*
 +
 +DELL SMBIOS SMM DRIVER
 +M:    Mario Limonciello <mario.limonciello@dell.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/x86/dell-smbios-smm.c
 +
 +DELL SMBIOS WMI DRIVER
 +M:    Mario Limonciello <mario.limonciello@dell.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/x86/dell-smbios-wmi.c
 +F:    tools/wmi/dell-smbios-example.c
 +
  DELL LAPTOP DRIVER
  M:    Matthew Garrett <mjg59@srcf.ucam.org>
  M:    Pali Rohár <pali.rohar@gmail.com>
@@@ -4084,17 -4022,12 +4084,17 @@@ S:   Maintaine
  F:    Documentation/dcdbas.txt
  F:    drivers/firmware/dcdbas.*
  
 -DELL WMI EXTRAS DRIVER
 +DELL WMI NOTIFICATIONS DRIVER
  M:    Matthew Garrett <mjg59@srcf.ucam.org>
  M:    Pali Rohár <pali.rohar@gmail.com>
  S:    Maintained
  F:    drivers/platform/x86/dell-wmi.c
  
 +DELL WMI DESCRIPTOR DRIVER
 +M:    Mario Limonciello <mario.limonciello@dell.com>
 +S:    Maintained
 +F:    drivers/platform/x86/dell-wmi-descriptor.c
 +
  DELTA ST MEDIA DRIVER
  M:    Hugues Fruchet <hugues.fruchet@st.com>
  L:    linux-media@vger.kernel.org
@@@ -4198,7 -4131,7 +4198,7 @@@ F:      Documentation/devicetree/bindings/mf
  F:    Documentation/devicetree/bindings/input/da90??-onkey.txt
  F:    Documentation/devicetree/bindings/thermal/da90??-thermal.txt
  F:    Documentation/devicetree/bindings/regulator/da92*.txt
 -F:    Documentation/devicetree/bindings/watchdog/da92??-wdt.txt
 +F:    Documentation/devicetree/bindings/watchdog/da90??-wdt.txt
  F:    Documentation/devicetree/bindings/sound/da[79]*.txt
  F:    drivers/gpio/gpio-da90??.c
  F:    drivers/hwmon/da90??-hwmon.c
@@@ -4246,7 -4179,7 +4246,7 @@@ L:      linux-i2c@vger.kernel.or
  S:    Maintained
  F:    drivers/i2c/busses/i2c-diolan-u2c.c
  
 -DIRECT ACCESS (DAX)
 +FILESYSTEM DIRECT ACCESS (DAX)
  M:    Matthew Wilcox <mawilcox@microsoft.com>
  M:    Ross Zwisler <ross.zwisler@linux.intel.com>
  L:    linux-fsdevel@vger.kernel.org
@@@ -4255,12 -4188,6 +4255,12 @@@ F:    fs/dax.
  F:    include/linux/dax.h
  F:    include/trace/events/fs_dax.h
  
 +DEVICE DIRECT ACCESS (DAX)
 +M:    Dan Williams <dan.j.williams@intel.com>
 +L:    linux-nvdimm@lists.01.org
 +S:    Supported
 +F:    drivers/dax/
 +
  DIRECTORY NOTIFICATION (DNOTIFY)
  M:    Jan Kara <jack@suse.cz>
  R:    Amir Goldstein <amir73il@gmail.com>
@@@ -4456,12 -4383,6 +4456,12 @@@ T:    git git://anongit.freedesktop.org/dr
  S:    Maintained
  F:    drivers/gpu/drm/bochs/
  
 +DRM DRIVER FOR FARADAY TVE200 TV ENCODER
 +M:    Linus Walleij <linus.walleij@linaro.org>
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +S:    Maintained
 +F:    drivers/gpu/drm/tve200/
 +
  DRM DRIVER FOR INTEL I810 VIDEO CARDS
  S:    Orphan / Obsolete
  F:    drivers/gpu/drm/i810/
@@@ -4605,7 -4526,7 +4605,7 @@@ L:      dri-devel@lists.freedesktop.or
  S:    Supported
  F:    drivers/gpu/drm/sun4i/
  F:    Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  DRM DRIVERS FOR AMLOGIC SOCS
  M:    Neil Armstrong <narmstrong@baylibre.com>
@@@ -4789,7 -4710,7 +4789,7 @@@ T:      git git://anongit.freedesktop.org/dr
  DRM PANEL DRIVERS
  M:    Thierry Reding <thierry.reding@gmail.com>
  L:    dri-devel@lists.freedesktop.org
 -T:    git git://anongit.freedesktop.org/tegra/linux.git
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  S:    Maintained
  F:    drivers/gpu/drm/drm_panel.c
  F:    drivers/gpu/drm/panel/
@@@ -5254,7 -5175,7 +5254,7 @@@ F:      drivers/video/fbdev/s1d13xxxfb.
  F:    include/video/s1d13xxxfb.h
  
  ERRSEQ ERROR TRACKING INFRASTRUCTURE
 -M:    Jeff Layton <jlayton@poochiereds.net>
 +M:    Jeff Layton <jlayton@kernel.org>
  S:    Maintained
  F:    lib/errseq.c
  F:    include/linux/errseq.h
@@@ -5431,7 -5352,7 +5431,7 @@@ F:      drivers/media/tuners/fc2580
  
  FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
  M:    Johannes Thumshirn <jth@kernel.org>
- L:    fcoe-devel@open-fcoe.org
+ L:    linux-scsi@vger.kernel.org
  W:    www.Open-FCoE.org
  S:    Supported
  F:    drivers/scsi/libfc/
@@@ -5442,7 -5363,7 +5442,7 @@@ F:      include/scsi/libfcoe.
  F:    include/uapi/scsi/fc/
  
  FILE LOCKING (flock() and fcntl()/lockf())
 -M:    Jeff Layton <jlayton@poochiereds.net>
 +M:    Jeff Layton <jlayton@kernel.org>
  M:    "J. Bruce Fields" <bfields@fieldses.org>
  L:    linux-fsdevel@vger.kernel.org
  S:    Maintained
@@@ -5532,7 -5453,7 +5532,7 @@@ K:      fmc_d.*registe
  
  FPGA MANAGER FRAMEWORK
  M:    Alan Tull <atull@kernel.org>
 -R:    Moritz Fischer <mdf@kernel.org>
 +M:    Moritz Fischer <mdf@kernel.org>
  L:    linux-fpga@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/atull/linux-fpga.git
@@@ -5557,7 -5478,6 +5557,7 @@@ F:      drivers/net/wan/sdla.
  
  FRAMEBUFFER LAYER
  M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
 +L:    dri-devel@lists.freedesktop.org
  L:    linux-fbdev@vger.kernel.org
  T:    git git://github.com/bzolnier/linux.git
  Q:    http://patchwork.kernel.org/project/linux-fbdev/list/
@@@ -6175,6 -6095,7 +6175,6 @@@ M:      Jean Delvare <jdelvare@suse.com
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
  W:    http://hwmon.wiki.kernel.org/
 -T:    quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
  S:    Maintained
  F:    Documentation/hwmon/
@@@ -6884,7 -6805,6 +6884,7 @@@ F:      drivers/ipack
  
  INFINIBAND SUBSYSTEM
  M:    Doug Ledford <dledford@redhat.com>
 +M:    Jason Gunthorpe <jgg@mellanox.com>
  L:    linux-rdma@vger.kernel.org
  W:    http://www.openfabrics.org/
  Q:    http://patchwork.kernel.org/project/linux-rdma/list/
@@@ -7210,11 -7130,6 +7210,11 @@@ F:    Documentation/wimax/README.i2400
  F:    drivers/net/wimax/i2400m/
  F:    include/uapi/linux/wimax/i2400m.h
  
 +INTEL WMI THUNDERBOLT FORCE POWER DRIVER
 +M:    Mario Limonciello <mario.limonciello@dell.com>
 +S:    Maintained
 +F:    drivers/platform/x86/intel-wmi-thunderbolt.c
 +
  INTEL(R) TRACE HUB
  M:    Alexander Shishkin <alexander.shishkin@linux.intel.com>
  S:    Supported
@@@ -7476,7 -7391,7 +7476,7 @@@ JFS FILESYSTE
  M:    Dave Kleikamp <shaggy@kernel.org>
  L:    jfs-discussion@lists.sourceforge.net
  W:    http://jfs.sourceforge.net/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git
 +T:    git git://github.com/kleikamp/linux-shaggy.git
  S:    Maintained
  F:    Documentation/filesystems/jfs.txt
  F:    fs/jfs/
@@@ -7592,7 -7507,7 +7592,7 @@@ S:      Odd Fixe
  
  KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
  M:    "J. Bruce Fields" <bfields@fieldses.org>
 -M:    Jeff Layton <jlayton@poochiereds.net>
 +M:    Jeff Layton <jlayton@kernel.org>
  L:    linux-nfs@vger.kernel.org
  W:    http://nfs.sourceforge.net/
  T:    git git://linux-nfs.org/~bfields/linux.git
@@@ -7713,7 -7628,6 +7713,7 @@@ S:      Supporte
  F:    arch/x86/kvm/
  F:    arch/x86/include/uapi/asm/kvm*
  F:    arch/x86/include/asm/kvm*
 +F:    arch/x86/include/asm/pvclock-abi.h
  F:    arch/x86/kernel/kvm.c
  F:    arch/x86/kernel/kvmclock.c
  
@@@ -7767,7 -7681,6 +7767,7 @@@ F:      security/keys
  
  KGDB / KDB /debug_core
  M:    Jason Wessel <jason.wessel@windriver.com>
 +M:    Daniel Thompson <daniel.thompson@linaro.org>
  W:    http://kgdb.wiki.kernel.org/
  L:    kgdb-bugreport@lists.sourceforge.net
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git
@@@ -7779,6 -7692,16 +7779,6 @@@ F:     include/linux/kdb.
  F:    include/linux/kgdb.h
  F:    kernel/debug/
  
 -KMEMCHECK
 -M:    Vegard Nossum <vegardno@ifi.uio.no>
 -M:    Pekka Enberg <penberg@kernel.org>
 -S:    Maintained
 -F:    Documentation/dev-tools/kmemcheck.rst
 -F:    arch/x86/include/asm/kmemcheck.h
 -F:    arch/x86/mm/kmemcheck/
 -F:    include/linux/kmemcheck.h
 -F:    mm/kmemcheck.c
 -
  KMEMLEAK
  M:    Catalin Marinas <catalin.marinas@arm.com>
  S:    Maintained
@@@ -9332,9 -9255,9 +9332,9 @@@ F:      drivers/gpu/drm/mxsfb
  F:    Documentation/devicetree/bindings/display/mxsfb-drm.txt
  
  MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
 -M:    Hyong-Youb Kim <hykim@myri.com>
 +M:    Chris Lee <christopher.lee@cspi.com>
  L:    netdev@vger.kernel.org
 -W:    https://www.myricom.com/support/downloads/myri10ge.html
 +W:    https://www.cspi.com/ethernet-products/support/downloads/
  S:    Supported
  F:    drivers/net/ethernet/myricom/myri10ge/
  
@@@ -9730,11 -9653,12 +9730,11 @@@ S:   Supporte
  F:    drivers/ntb/hw/idt/
  
  NTB INTEL DRIVER
 -M:    Jon Mason <jdmason@kudzu.us>
  M:    Dave Jiang <dave.jiang@intel.com>
  L:    linux-ntb@googlegroups.com
  S:    Supported
 -W:    https://github.com/jonmason/ntb/wiki
 -T:    git git://github.com/jonmason/ntb.git
 +W:    https://github.com/davejiang/linux/wiki
 +T:    git https://github.com/davejiang/linux.git
  F:    drivers/ntb/hw/intel/
  
  NTFS FILESYSTEM
@@@ -10446,8 -10370,6 +10446,8 @@@ F:   Documentation/switchtec.tx
  F:    Documentation/ABI/testing/sysfs-class-switchtec
  F:    drivers/pci/switch/switchtec*
  F:    include/uapi/linux/switchtec_ioctl.h
 +F:    include/linux/switchtec.h
 +F:    drivers/ntb/hw/mscc/
  
  PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
  M:    Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
@@@ -10666,12 -10588,6 +10666,12 @@@ S: Maintaine
  F:    crypto/pcrypt.c
  F:    include/crypto/pcrypt.h
  
 +PEAQ WMI HOTKEYS DRIVER
 +M:    Hans de Goede <hdegoede@redhat.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/x86/peaq-wmi.c
 +
  PER-CPU MEMORY ALLOCATOR
  M:    Tejun Heo <tj@kernel.org>
  M:    Christoph Lameter <cl@linux.com>
@@@ -10785,7 -10701,6 +10785,7 @@@ PIN CONTROLLER - RENESA
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  M:    Geert Uytterhoeven <geert+renesas@glider.be>
  L:    linux-renesas-soc@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git sh-pfc
  S:    Maintained
  F:    drivers/pinctrl/sh-pfc/
  
@@@ -11585,7 -11500,6 +11585,7 @@@ F:   include/linux/rpmsg
  RENESAS CLOCK DRIVERS
  M:    Geert Uytterhoeven <geert+renesas@glider.be>
  L:    linux-renesas-soc@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas
  S:    Supported
  F:    drivers/clk/renesas/
  
@@@ -11668,13 -11582,6 +11668,13 @@@ F: drivers/hid/hid-roccat
  F:    include/linux/hid-roccat*
  F:    Documentation/ABI/*/sysfs-driver-hid-roccat*
  
 +ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER
 +M:    Jacob chen <jacob2.chen@rock-chips.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/platform/rockchip/rga/
 +F:    Documentation/devicetree/bindings/media/rockchip-rga.txt
 +
  ROCKER DRIVER
  M:    Jiri Pirko <jiri@resnulli.us>
  L:    netdev@vger.kernel.org
@@@ -11778,18 -11685,6 +11778,18 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/net/wireless/realtek/rtl8xxxu/
  
 +RXRPC SOCKETS (AF_RXRPC)
 +M:    David Howells <dhowells@redhat.com>
 +L:    linux-afs@lists.infradead.org
 +S:    Supported
 +F:    net/rxrpc/
 +F:    include/keys/rxrpc-type.h
 +F:    include/net/af_rxrpc.h
 +F:    include/trace/events/rxrpc.h
 +F:    include/uapi/linux/rxrpc.h
 +F:    Documentation/networking/rxrpc.txt
 +W:    https://www.infradead.org/~dhowells/kafs/
 +
  S3 SAVAGE FRAMEBUFFER DRIVER
  M:    Antonino Daplas <adaplas@gmail.com>
  L:    linux-fbdev@vger.kernel.org
@@@ -12643,14 -12538,6 +12643,14 @@@ S: Maintaine
  F:    drivers/ssb/
  F:    include/linux/ssb/
  
 +SONY IMX274 SENSOR DRIVER
 +M:    Leon Luo <leonl@leopardimaging.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/imx274.c
 +F:    Documentation/devicetree/bindings/media/i2c/imx274.txt
 +
  SONY MEMORYSTICK CARD SUPPORT
  M:    Alex Dubov <oakad@yahoo.com>
  W:    http://tifmxx.berlios.de/
@@@ -12844,13 -12731,6 +12844,13 @@@ L: stable@vger.kernel.or
  S:    Supported
  F:    Documentation/process/stable-kernel-rules.rst
  
 +STAGING - ATOMISP DRIVER
 +M:    Alan Cox <alan@linux.intel.com>
 +M:    Sakari Ailus <sakari.ailus@linux.intel.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/staging/media/atomisp/
 +
  STAGING - COMEDI
  M:    Ian Abbott <abbotti@mev.co.uk>
  M:    H Hartley Sweeten <hsweeten@visionengravers.com>
@@@ -13094,12 -12974,6 +13094,12 @@@ F: arch/arc/plat-axs10
  F:    arch/arc/boot/dts/ax*
  F:    Documentation/devicetree/bindings/arc/axs10*
  
 +SYNOPSYS AXS10x RESET CONTROLLER DRIVER
 +M:    Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
 +S:    Supported
 +F:    drivers/reset/reset-axs10x.c
 +F:    Documentation/devicetree/bindings/reset/snps,axs10x-reset.txt
 +
  SYNOPSYS DESIGNWARE APB GPIO DRIVER
  M:    Hoan Tran <hotran@apm.com>
  L:    linux-gpio@vger.kernel.org
@@@ -13490,7 -13364,6 +13490,7 @@@ M:   Andreas Noever <andreas.noever@gmail
  M:    Michael Jamet <michael.jamet@intel.com>
  M:    Mika Westerberg <mika.westerberg@linux.intel.com>
  M:    Yehezkel Bernat <yehezkel.bernat@intel.com>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git
  S:    Maintained
  F:    drivers/thunderbolt/
  F:    include/linux/thunderbolt.h
@@@ -13669,8 -13542,10 +13669,8 @@@ F:  drivers/net/wireless/ti
  F:    include/linux/wl12xx.h
  
  TILE ARCHITECTURE
 -M:    Chris Metcalf <cmetcalf@mellanox.com>
  W:    http://www.mellanox.com/repository/solutions/tile-scm/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git
 -S:    Supported
 +S:    Orphan
  F:    arch/tile/
  F:    drivers/char/tile-srom.c
  F:    drivers/edac/tile_edac.c
@@@ -14584,7 -14459,7 +14584,7 @@@ M:   Manohar Vanga <manohar.vanga@gmail.c
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  L:    devel@driverdev.osuosl.org
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
  F:    Documentation/driver-api/vme.rst
  F:    drivers/staging/vme/
  F:    drivers/vme/
@@@ -14935,7 -14810,6 +14935,7 @@@ F:   arch/x86/xen
  F:    drivers/*/xen-*front.c
  F:    drivers/xen/
  F:    arch/x86/include/asm/xen/
 +F:    arch/x86/include/asm/pvclock-abi.h
  F:    include/xen/
  F:    include/uapi/xen/
  F:    Documentation/ABI/stable/sysfs-hypervisor-xen

diff --combined drivers/scsi/libsas/sas_expander.c
index ca1566237ae7744703a9e3ae3533138c4e81af53,c7f21661b3cdf4574775482d682b54dfea66af96..3183d63de4dab7f5b000f2b6da856eea70c6b900
--- 1/drivers/scsi/libsas/sas_expander.c
--- 2/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@@ -92,7 -92,7 +92,7 @@@ static int smp_execute_task_sg(struct d
  
                task->task_done = smp_task_done;
  
 -              task->slow_task->timer.function = (TIMER_FUNC_TYPE)smp_task_timedout;
 +              task->slow_task->timer.function = smp_task_timedout;
                task->slow_task->timer.expires = jiffies + SMP_TIMEOUT*HZ;
                add_timer(&task->slow_task->timer);
  
@@@ -2145,7 -2145,7 +2145,7 @@@ void sas_smp_handler(struct bsg_job *jo
                struct sas_rphy *rphy)
  {
        struct domain_device *dev;
-       unsigned int reslen = 0;
+       unsigned int rcvlen = 0;
        int ret = -EINVAL;
  
        /* no rphy means no smp target support (ie aic94xx host) */
@@@ -2179,12 -2179,12 +2179,12 @@@
  
        ret = smp_execute_task_sg(dev, job->request_payload.sg_list,
                        job->reply_payload.sg_list);
-       if (ret > 0) {
-               /* positive number is the untransferred residual */
-               reslen = ret;
+       if (ret >= 0) {
+               /* bsg_job_done() requires the length received  */
+               rcvlen = job->reply_payload.payload_len - ret;
                ret = 0;
        }
  
  out:
-       bsg_job_done(job, ret, reslen);
+       bsg_job_done(job, ret, rcvlen);
  }