Merge branch 'for-linus' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:
 "A set of fixes that wasn't included in the first merge window pull
  request.  This pull request contains:

   - A set of NVMe fixes from Keith, and one from Nic for the integrity
     side of it.

   - Fix from Ming, clearing ->mq_ops if we don't successfully setup a
     queue for multiqueue.

   - A set of stability fixes for bcache from Jiri, and also marking
     bcache as orphaned as it's no longer actively maintained (in
     mainline, at least)"

* 'for-linus' of git://git.kernel.dk/linux-block:
  blk-mq: clear q->mq_ops if init fail
  MAINTAINERS: mark bcache as orphan
  bcache: bch_gc_thread() is not freezable
  bcache: bch_allocator_thread() is not freezable
  bcache: bch_writeback_thread() is not freezable
  nvme/host: Add missing blk_integrity tag_size + flags assignments
  NVMe: Add device ID's with stripe quirk
  NVMe: Short-cut removal on surprise hot-unplug
  NVMe: Allow user initiated rescan
  NVMe: Reduce driver log spamming
  NVMe: Unbind driver on failure
  NVMe: Delete only created queues
  NVMe: Allocate queues only for online cpus

diff --combined MAINTAINERS
index c68eaeb5a5c0ba2c791afbf0e500bede4bb5e4af,f6f479549f4e3feea311476ef51982eccf6059b1..f2d7337ebdb3d10078f7f941051097f0b0254ab1
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -175,6 -175,7 +175,6 @@@ F: drivers/net/ethernet/realtek/r8169.
  8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
  M:    Greg Kroah-Hartman <[email protected]>
  L:    [email protected]
 -W:    http://serial.sourceforge.net
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
  F:    drivers/tty/serial/8250*
@@@ -776,15 -777,6 +776,15 @@@ S:       Supporte
  F:    drivers/android/
  F:    drivers/staging/android/
  
 +ANDROID ION DRIVER
 +M:    Laura Abbott <[email protected]>
 +M:    Sumit Semwal <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/staging/android/ion
 +F:    drivers/staging/android/uapi/ion.h
 +F:    drivers/staging/android/uapi/ion_test.h
 +
  AOA (Apple Onboard Audio) ALSA DRIVER
  M:    Johannes Berg <[email protected]>
  L:    [email protected]
@@@ -856,12 -848,6 +856,12 @@@ S:       Maintaine
  F:    drivers/net/arcnet/
  F:    include/uapi/linux/if_arcnet.h
  
 +ARC PGU DRM DRIVER
 +M:    Alexey Brodkin <[email protected]>
 +S:    Supported
 +F:    drivers/gpu/drm/arc/
 +F:    Documentation/devicetree/bindings/display/snps,arcpgu.txt
 +
  ARM HDLCD DRM DRIVER
  M:    Liviu Dudau <[email protected]>
  S:    Supported
@@@ -963,15 -949,12 +963,15 @@@ F:      drivers/clk/sunxi
  
  ARM/Amlogic Meson SoC support
  M:    Carlo Caione <[email protected]>
 +M:    Kevin Hilman <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -L:    linux-[email protected]
 +L:    linux-[email protected]
  W:    http://linux-meson.com/
  S:    Maintained
  F:    arch/arm/mach-meson/
  F:    arch/arm/boot/dts/meson*
 +F:    arch/arm64/boot/dts/amlogic/
 +F:    drivers/pinctrl/meson/
  N:    meson
  
  ARM/Annapurna Labs ALPINE ARCHITECTURE
@@@ -991,14 -974,7 +991,14 @@@ S:       Maintaine
  L:    [email protected]
  F:    arch/arm/mach-artpec
  F:    arch/arm/boot/dts/artpec6*
 -F:    drivers/clk/clk-artpec6.c
 +F:    drivers/clk/axis
 +
 +ARM/ASPEED MACHINE SUPPORT
 +M:    Joel Stanley <[email protected]>
 +S:    Maintained
 +F:    arch/arm/mach-aspeed/
 +F:    arch/arm/boot/dts/aspeed-*
 +F:    drivers/*/*aspeed*
  
  ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
  M:    Nicolas Ferre <[email protected]>
@@@ -1285,7 -1261,7 +1285,7 @@@ M:      Santosh Shilimkar <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-keystone/
 -F:    arch/arm/boot/dts/k2*
 +F:    arch/arm/boot/dts/keystone-*
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
  
  ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK
@@@ -1313,12 -1289,6 +1313,12 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/memory/*emif*
  
 +ARM/LG1K ARCHITECTURE
 +M:    Chanho Min <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm64/boot/dts/lg/
 +
  ARM/LOGICPD PXA270 MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1337,25 -1307,11 +1337,25 @@@ F:   drivers/mtd/spi-nor/nxp-spifi.
  F:    drivers/rtc/rtc-lpc24xx.c
  N:    lpc18xx
  
 +ARM/LPC32XX SOC SUPPORT
 +M:    Vladimir Zapolskiy <[email protected]>
 +M:    Sylvain Lemieux <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +T:    git git://github.com/vzapolskiy/linux-lpc32xx.git
 +S:    Maintained
 +F:    arch/arm/boot/dts/lpc32*
 +F:    arch/arm/mach-lpc32xx/
 +F:    drivers/i2c/busses/i2c-pnx.c
 +F:    drivers/net/ethernet/nxp/lpc_eth.c
 +F:    drivers/usb/host/ohci-nxp.c
 +F:    drivers/watchdog/pnx4008_wdt.c
 +N:    lpc32xx
 +
  ARM/MAGICIAN MACHINE SUPPORT
  M:    Philipp Zabel <[email protected]>
  S:    Maintained
  
 -ARM/Marvell Kirkwood and Armada 370, 375, 38x, XP SOC support
 +ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K SOC support
  M:    Jason Cooper <[email protected]>
  M:    Andrew Lunn <[email protected]>
  M:    Gregory Clement <[email protected]>
@@@ -1368,7 -1324,7 +1368,7 @@@ F:      arch/arm/boot/dts/armada
  F:    arch/arm/boot/dts/kirkwood*
  F:    arch/arm64/boot/dts/marvell/armada*
  F:    drivers/cpufreq/mvebu-cpufreq.c
 -
 +F:    arch/arm/configs/mvebu_*_defconfig
  
  ARM/Marvell Berlin SoC support
  M:    Sebastian Hesselbarth <[email protected]>
@@@ -1401,15 -1357,6 +1401,15 @@@ W:    http://www.digriz.org.uk/ts78xx/kern
  S:    Maintained
  F:    arch/arm/mach-orion5x/ts78xx-*
  
 +ARM/OXNAS platform support
 +M:    Neil Armstrong <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-oxnas/
 +F:    arch/arm/boot/dts/oxnas*
 +F:    arch/arm/boot/dts/wd-mbwe.dts
 +N:    oxnas
 +
  ARM/Mediatek RTC DRIVER
  M:    Eddie Huang <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1525,10 -1472,7 +1525,10 @@@ F:    arch/arm/boot/dts/qcom-*.dt
  F:    arch/arm/boot/dts/qcom-*.dtsi
  F:    arch/arm/mach-qcom/
  F:    arch/arm64/boot/dts/qcom/*
 +F:    drivers/i2c/busses/i2c-qup.c
 +F:    drivers/clk/qcom/
  F:    drivers/soc/qcom/
 +F:    drivers/spi/spi-qup.c
  F:    drivers/tty/serial/msm_serial.h
  F:    drivers/tty/serial/msm_serial.c
  F:    drivers/*/pm8???-*
@@@ -1549,8 -1493,6 +1549,8 @@@ 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:    drivers/soc/renesas/
 +F:    include/linux/soc/renesas/
  
  ARM/RISCPC ARCHITECTURE
  M:    Russell King <[email protected]>
@@@ -1600,7 -1542,6 +1600,7 @@@ F:      arch/arm/mach-s5p*
  F:    arch/arm/mach-exynos*/
  F:    drivers/*/*s3c2410*
  F:    drivers/*/*/*s3c2410*
 +F:    drivers/memory/samsung/*
  F:    drivers/soc/samsung/*
  F:    drivers/spi/spi-s3c*
  F:    sound/soc/samsung/*
@@@ -1665,8 -1606,6 +1665,8 @@@ F:      arch/arm/configs/shmobile_defconfi
  F:    arch/arm/include/debug/renesas-scif.S
  F:    arch/arm/mach-shmobile/
  F:    drivers/sh/
 +F:    drivers/soc/renesas/
 +F:    include/linux/soc/renesas/
  
  ARM/SOCFPGA ARCHITECTURE
  M:    Dinh Nguyen <[email protected]>
@@@ -1701,7 -1640,6 +1701,7 @@@ F:      arch/arm/boot/dts/sti
  F:    drivers/char/hw_random/st-rng.c
  F:    drivers/clocksource/arm_global_timer.c
  F:    drivers/clocksource/clksrc_st_lpc.c
 +F:    drivers/cpufreq/sti-cpufreq.c
  F:    drivers/i2c/busses/i2c-st.c
  F:    drivers/media/rc/st_rc.c
  F:    drivers/media/platform/sti/c8sectpfe/
@@@ -1711,7 -1649,6 +1711,7 @@@ F:      drivers/phy/phy-miphy365x.
  F:    drivers/phy/phy-stih407-usb.c
  F:    drivers/phy/phy-stih41x-usb.c
  F:    drivers/pinctrl/pinctrl-st.c
 +F:    drivers/remoteproc/st_remoteproc.c
  F:    drivers/reset/sti/
  F:    drivers/rtc/rtc-st-lpc.c
  F:    drivers/tty/serial/st-asc.c
@@@ -1836,7 -1773,6 +1836,7 @@@ F:      */*/vexpress
  F:    */*/*/vexpress*
  F:    drivers/clk/versatile/clk-vexpress-osc.c
  F:    drivers/clocksource/versatile.c
 +N:    mps2
  
  ARM/VFP SUPPORT
  M:    Russell King <[email protected]>
@@@ -1951,16 -1887,6 +1951,16 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/platform/x86/asus-wireless.c
  
 +ASYMMETRIC KEYS
 +M:    David Howells <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/crypto/asymmetric-keys.txt
 +F:    include/linux/verification.h
 +F:    include/crypto/public_key.h
 +F:    include/crypto/pkcs7.h
 +F:    crypto/asymmetric_keys/
 +
  ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
  R:    Dan Williams <[email protected]>
  W:    http://sourceforge.net/projects/xscaleiop
@@@ -2072,11 -1998,6 +2072,11 @@@ M:    Nicolas Ferre <[email protected]
  S:    Supported
  F:    drivers/tty/serial/atmel_serial.c
  
 +ATMEL AT91 SAMA5D2-Compatible Shutdown Controller
 +M:    Nicolas Ferre <[email protected]>
 +S:    Supported
 +F:    drivers/power/reset/at91-sama5d2_shdwc.c
 +
  ATMEL SAMA5D2 ADC DRIVER
  M:    Ludovic Desroches <[email protected]>
  L:    [email protected]
@@@ -2284,13 -2205,10 +2284,13 @@@ BATMAN ADVANCE
  M:    Marek Lindner <[email protected]>
  M:    Simon Wunderlich <[email protected]>
  M:    Antonio Quartulli <[email protected]>
 -L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  W:    https://www.open-mesh.org/
  Q:    https://patchwork.open-mesh.org/project/batman/list/
  S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-class-net-batman-adv
 +F:    Documentation/ABI/testing/sysfs-class-net-mesh
 +F:    Documentation/networking/batman-adv.txt
  F:    net/batman-adv/
  
  BAYCOM/HDLCDRV DRIVERS FOR AX.25
@@@ -2304,7 -2222,7 +2304,7 @@@ BCACHE (BLOCK LAYER CACHE
  M:    Kent Overstreet <[email protected]>
  L:    [email protected]
  W:    http://bcache.evilpiepirate.org
- S:    Maintained
+ S:    Orphan
  F:    drivers/md/bcache/
  
  BDISP ST MEDIA DRIVER
@@@ -3432,7 -3350,6 +3432,7 @@@ F:      Documentation/powerpc/cxlflash.tx
  
  STMMAC ETHERNET DRIVER
  M:    Giuseppe Cavallaro <[email protected]>
 +M:    Alexandre Torgue <[email protected]>
  L:    [email protected]
  W:    http://www.stlinux.com
  S:    Supported
@@@ -3853,25 -3770,9 +3853,25 @@@ T:    git git://people.freedesktop.org/~ai
  S:    Maintained
  F:    drivers/gpu/drm/
  F:    drivers/gpu/vga/
 +F:    Documentation/DocBook/gpu.*
  F:    include/drm/
  F:    include/uapi/drm/
  
 +DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
 +M:    Dave Airlie <[email protected]>
 +S:    Odd Fixes
 +F:    drivers/gpu/drm/ast/
 +
 +DRM DRIVER FOR BOCHS VIRTUAL GPU
 +M:    Gerd Hoffmann <[email protected]>
 +S:    Odd Fixes
 +F:    drivers/gpu/drm/bochs/
 +
 +DRM DRIVER FOR QEMU'S CIRRUS DEVICE
 +M:    Dave Airlie <[email protected]>
 +S:    Odd Fixes
 +F:    drivers/gpu/drm/cirrus/
 +
  RADEON and AMDGPU DRM DRIVERS
  M:    Alex Deucher <[email protected]>
  M:    Christian König <[email protected]>
@@@ -3879,9 -3780,9 +3879,9 @@@ L:      [email protected]
  T:    git git://people.freedesktop.org/~agd5f/linux
  S:    Supported
  F:    drivers/gpu/drm/radeon/
 -F:    include/uapi/drm/radeon*
 +F:    include/uapi/drm/radeon_drm.h
  F:    drivers/gpu/drm/amd/
 -F:    include/uapi/drm/amdgpu*
 +F:    include/uapi/drm/amdgpu_drm.h
  
  DRM PANEL DRIVERS
  M:    Thierry Reding <[email protected]>
@@@ -3904,7 -3805,7 +3904,7 @@@ T:      git git://anongit.freedesktop.org/dr
  S:    Supported
  F:    drivers/gpu/drm/i915/
  F:    include/drm/i915*
 -F:    include/uapi/drm/i915*
 +F:    include/uapi/drm/i915_drm.h
  
  DRM DRIVERS FOR ATMEL HLCDC
  M:    Boris Brezillon <[email protected]>
@@@ -3913,13 -3814,6 +3913,13 @@@ S:    Supporte
  F:    drivers/gpu/drm/atmel-hlcdc/
  F:    Documentation/devicetree/bindings/drm/atmel/
  
 +DRM DRIVERS FOR ALLWINNER A10
 +M:    Maxime Ripard  <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/gpu/drm/sun4i/
 +F:    Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
 +
  DRM DRIVERS FOR EXYNOS
  M:    Inki Dae <[email protected]>
  M:    Joonyoung Shim <[email protected]>
@@@ -3929,8 -3823,8 +3929,8 @@@ L:      [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git
  S:    Supported
  F:    drivers/gpu/drm/exynos/
 -F:    include/drm/exynos*
 -F:    include/uapi/drm/exynos*
 +F:    include/uapi/drm/exynos_drm.h
 +F:    Documentation/devicetree/bindings/display/exynos/
  
  DRM DRIVERS FOR FREESCALE DCU
  M:    Stefan Agner <[email protected]>
@@@ -3939,7 -3833,6 +3939,7 @@@ L:      [email protected]
  S:    Supported
  F:    drivers/gpu/drm/fsl-dcu/
  F:    Documentation/devicetree/bindings/display/fsl,dcu.txt
 +F:    Documentation/devicetree/bindings/display/fsl,tcon.txt
  F:    Documentation/devicetree/bindings/display/panel/nec,nl4827hc19_05b.txt
  
  DRM DRIVERS FOR FREESCALE IMX
@@@ -3955,45 -3848,12 +3955,45 @@@ M:   Patrik Jakobsson <patrik.r.jakobsson
  L:    [email protected]
  T:    git git://github.com/patjak/drm-gma500
  S:    Maintained
 -F:    drivers/gpu/drm/gma500
 -F:    include/drm/gma500*
 +F:    drivers/gpu/drm/gma500/
 +
 +DRM DRIVERS FOR HISILICON
 +M:    Xinliang Liu <[email protected]>
 +R:    Xinwei Kong <[email protected]>
 +R:    Chen Feng <[email protected]>
 +L:    [email protected]
 +T:    git git://github.com/xin3liang/linux.git
 +S:    Maintained
 +F:    drivers/gpu/drm/hisilicon/
 +F:    Documentation/devicetree/bindings/display/hisilicon/
 +
 +DRM DRIVER FOR INTEL I810 VIDEO CARDS
 +S:    Orphan / Obsolete
 +F:    drivers/gpu/drm/i810/
 +F:    include/uapi/drm/i810_drm.h
 +
 +DRM DRIVER FOR MSM ADRENO GPU
 +M:    Rob Clark <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +L:    [email protected]
 +T:    git git://people.freedesktop.org/~robclark/linux
 +S:    Maintained
 +F:    drivers/gpu/drm/msm/
 +F:    include/uapi/drm/msm_drm.h
 +F:    Documentation/devicetree/bindings/display/msm/
 +
 +DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS
 +M:    Ben Skeggs <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +T:    git git://github.com/skeggsb/linux
 +S:    Supported
 +F:    drivers/gpu/drm/nouveau/
 +F:    include/uapi/drm/nouveau_drm.h
  
  DRM DRIVERS FOR NVIDIA TEGRA
  M:    Thierry Reding <[email protected]>
 -M:    Terje Bergström <[email protected]>
  L:    [email protected]
  L:    [email protected]
  T:    git git://anongit.freedesktop.org/tegra/linux.git
@@@ -4004,54 -3864,22 +4004,54 @@@ F:   include/linux/host1x.
  F:    include/uapi/drm/tegra_drm.h
  F:    Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt
  
 +DRM DRIVER FOR MATROX G200/G400 GRAPHICS CARDS
 +S:    Orphan / Obsolete
 +F:    drivers/gpu/drm/mga/
 +F:    include/uapi/drm/mga_drm.h
 +
 +DRM DRIVER FOR MGA G200 SERVER GRAPHICS CHIPS
 +M:    Dave Airlie <[email protected]>
 +S:    Odd Fixes
 +F:    drivers/gpu/drm/mgag200/
 +
 +DRM DRIVER FOR RAGE 128 VIDEO CARDS
 +S:    Orphan / Obsolete
 +F:    drivers/gpu/drm/r128/
 +F:    include/uapi/drm/r128_drm.h
 +
  DRM DRIVERS FOR RENESAS
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
  L:    [email protected]
 -T:    git git://people.freedesktop.org/~airlied/linux
 +T:    git git://linuxtv.org/pinchartl/fbdev
  S:    Supported
  F:    drivers/gpu/drm/rcar-du/
  F:    drivers/gpu/drm/shmobile/
  F:    include/linux/platform_data/shmob_drm.h
 +F:    Documentation/devicetree/bindings/display/renesas,du.txt
 +
 +DRM DRIVER FOR QXL VIRTUAL GPU
 +M:    Dave Airlie <[email protected]>
 +S:    Odd Fixes
 +F:    drivers/gpu/drm/qxl/
 +F:    include/uapi/drm/qxl_drm.h
  
  DRM DRIVERS FOR ROCKCHIP
  M:    Mark Yao <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/gpu/drm/rockchip/
 -F:    Documentation/devicetree/bindings/display/rockchip*
 +F:    Documentation/devicetree/bindings/display/rockchip/
 +
 +DRM DRIVER FOR SAVAGE VIDEO CARDS
 +S:    Orphan / Obsolete
 +F:    drivers/gpu/drm/savage/
 +F:    include/uapi/drm/savage_drm.h
 +
 +DRM DRIVER FOR SIS VIDEO CARDS
 +S:    Orphan / Obsolete
 +F:    drivers/gpu/drm/sis/
 +F:    include/uapi/drm/sis_drm.h
  
  DRM DRIVERS FOR STI
  M:    Benjamin Gaignard <[email protected]>
@@@ -4062,43 -3890,14 +4062,43 @@@ S:   Maintaine
  F:    drivers/gpu/drm/sti
  F:    Documentation/devicetree/bindings/display/st,stih4xx.txt
  
 +DRM DRIVER FOR TDFX VIDEO CARDS
 +S:    Orphan / Obsolete
 +F:    drivers/gpu/drm/tdfx/
 +
 +DRM DRIVER FOR USB DISPLAYLINK VIDEO ADAPTERS
 +M:    Dave Airlie <[email protected]>
 +S:    Odd Fixes
 +F:    drivers/gpu/drm/udl/
 +
  DRM DRIVERS FOR VIVANTE GPU IP
  M:    Lucas Stach <[email protected]>
  R:    Russell King <[email protected]>
  R:    Christian Gmeiner <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/gpu/drm/etnaviv
 -F:    Documentation/devicetree/bindings/display/etnaviv
 +F:    drivers/gpu/drm/etnaviv/
 +F:    include/uapi/drm/etnaviv_drm.h
 +F:    Documentation/devicetree/bindings/display/etnaviv/
 +
 +DRM DRIVER FOR VMWARE VIRTUAL GPU
 +M:    "VMware Graphics" <[email protected]>
 +M:    Sinclair Yeh <[email protected]>
 +M:    Thomas Hellstrom <[email protected]>
 +L:    [email protected]
 +T:    git git://people.freedesktop.org/~syeh/repos_linux
 +T:    git git://people.freedesktop.org/~thomash/linux
 +S:    Supported
 +F:    drivers/gpu/drm/vmwgfx/
 +F:    include/uapi/drm/vmwgfx_drm.h
 +
 +DRM DRIVERS FOR VC4
 +M:    Eric Anholt <[email protected]>
 +T:    git git://github.com/anholt/linux
 +S:    Supported
 +F:    drivers/gpu/drm/vc4/
 +F:    include/uapi/drm/vc4_drm.h
 +F:    Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt
  
  DSBR100 USB FM RADIO DRIVER
  M:    Alexey Klimov <[email protected]>
@@@ -4591,12 -4390,6 +4591,12 @@@ S:    Maintaine
  F:    drivers/video/fbdev/exynos/exynos_mipi*
  F:    include/video/exynos_mipi*
  
 +EZchip NPS platform support
 +M:    Noam Camus <[email protected]>
 +S:    Supported
 +F:    arch/arc/plat-eznps
 +F:    arch/arc/boot/dts/eznps.dts
 +
  F71805F HARDWARE MONITORING DRIVER
  M:    Jean Delvare <[email protected]>
  L:    [email protected]
@@@ -4879,7 -4672,6 +4879,7 @@@ FREESCALE SOC SOUND DRIVER
  M:    Timur Tabi <[email protected]>
  M:    Nicolin Chen <[email protected]>
  M:    Xiubo Li <[email protected]>
 +R:    Fabio Estevam <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
@@@ -4889,7 -4681,6 +4889,7 @@@ F:      sound/soc/fsl/mpc8610_hpcd.
  
  FREESCALE QORIQ MANAGEMENT COMPLEX DRIVER
  M:    "J. German Rivera" <[email protected]>
 +M:    Stuart Yoder <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/staging/fsl-mc/
@@@ -4927,7 -4718,7 +4927,7 @@@ F:      include/linux/fscache*.
  F2FS FILE SYSTEM
  M:    Jaegeuk Kim <[email protected]>
  M:    Changman Lee <[email protected]>
 -R:    Chao Yu <chao2.yu@samsung.com>
 +R:    Chao Yu <yuchao0@huawei.com>
  L:    [email protected]
  W:    http://en.wikipedia.org/wiki/F2FS
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
@@@ -4993,7 -4784,6 +4993,7 @@@ F:      drivers/scsi/gdt
  
  GDB KERNEL DEBUGGING HELPER SCRIPTS
  M:    Jan Kiszka <[email protected]>
 +M:    Kieran Bingham <[email protected]>
  S:    Supported
  F:    scripts/gdb/
  
@@@ -5105,7 -4895,6 +5105,7 @@@ M:      Alexandre Courbot <[email protected]
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
  S:    Maintained
 +F:    Documentation/devicetree/bindings/gpio/
  F:    Documentation/gpio/
  F:    Documentation/ABI/testing/gpio-cdev
  F:    Documentation/ABI/obsolete/sysfs-gpio
@@@ -5497,7 -5286,6 +5497,7 @@@ I2C MUXE
  M:    Peter Rosin <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/i2c/i2c-topology
  F:    Documentation/i2c/muxes/
  F:    Documentation/devicetree/bindings/i2c/i2c-mux*
  F:    drivers/i2c/i2c-mux.c
@@@ -5762,7 -5550,7 +5762,7 @@@ IIO SUBSYSTEM AND DRIVER
  M:    Jonathan Cameron <[email protected]>
  R:    Hartmut Knaack <[email protected]>
  R:    Lars-Peter Clausen <[email protected]>
 -R:    Peter Meerwald <[email protected]>
 +R:    Peter Meerwald-Stadler <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/iio/
@@@ -5967,6 -5755,13 +5967,6 @@@ F:     drivers/char/hw_random/ixp4xx-rng.
  
  INTEL ETHERNET DRIVERS
  M:    Jeff Kirsher <[email protected]>
 -R:    Jesse Brandeburg <[email protected]>
 -R:    Shannon Nelson <[email protected]>
 -R:    Carolyn Wyborny <[email protected]>
 -R:    Don Skidmore <[email protected]>
 -R:    Bruce Allan <[email protected]>
 -R:    John Ronciak <[email protected]>
 -R:    Mitch Williams <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  W:    http://www.intel.com/support/feedback.htm
  W:    http://e1000.sourceforge.net/
@@@ -6046,7 -5841,6 +6046,7 @@@ F:      drivers/net/wireless/intel/iwlegacy
  INTEL WIRELESS WIFI LINK (iwlwifi)
  M:    Johannes Berg <[email protected]>
  M:    Emmanuel Grumbach <[email protected]>
 +M:    Luca Coelho <[email protected]>
  M:    Intel Linux Wireless <[email protected]>
  L:    [email protected]
  W:    http://intellinuxwireless.org
@@@ -6096,14 -5890,6 +6096,14 @@@ S:    Maintaine
  F:    arch/x86/include/asm/intel_telemetry.h
  F:    drivers/platform/x86/intel_telemetry*
  
 +INTEL PMC CORE DRIVER
 +M:    Rajneesh Bhardwaj <[email protected]>
 +M:    Vishwanath Somayaji <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/x86/include/asm/pmc_core.h
 +F:    drivers/platform/x86/intel_pmc_core*
 +
  IOC3 ETHERNET DRIVER
  M:    Ralf Baechle <[email protected]>
  L:    [email protected]
@@@ -6220,13 -6006,6 +6220,13 @@@ F:    include/linux/irqdomain.
  F:    kernel/irq/irqdomain.c
  F:    kernel/irq/msi.c
  
 +ISA
 +M:    William Breathitt Gray <[email protected]>
 +S:    Maintained
 +F:    Documentation/isa.txt
 +F:    drivers/base/isa.c
 +F:    include/linux/isa.h
 +
  ISAPNP
  M:    Jaroslav Kysela <[email protected]>
  S:    Maintained
@@@ -6407,7 -6186,7 +6407,7 @@@ S:      Maintaine
  F:    arch/*/include/asm/kasan.h
  F:    arch/*/mm/kasan_init*
  F:    Documentation/kasan.txt
 -F:    include/linux/kasan.h
 +F:    include/linux/kasan*.h
  F:    lib/test_kasan.c
  F:    mm/kasan/
  F:    scripts/Makefile.kasan
@@@ -6499,7 -6278,6 +6499,7 @@@ F:      arch/*/include/asm/kvm
  F:    include/linux/kvm*
  F:    include/uapi/linux/kvm*
  F:    virt/kvm/
 +F:    tools/kvm/
  
  KERNEL VIRTUAL MACHINE (KVM) FOR AMD-V
  M:    Joerg Roedel <[email protected]>
@@@ -6577,8 -6355,6 +6577,8 @@@ S:      Maintaine
  F:    Documentation/security/keys.txt
  F:    include/linux/key.h
  F:    include/linux/key-type.h
 +F:    include/linux/keyctl.h
 +F:    include/uapi/linux/keyctl.h
  F:    include/keys/
  F:    security/keys/
  
@@@ -6661,7 -6437,7 +6661,7 @@@ F:      net/l3mde
  F:    include/net/l3mdev.h
  
  LANTIQ MIPS ARCHITECTURE
 -M:    John Crispin <blogic@openwrt.org>
 +M:    John Crispin <john@phrozen.org>
  L:    [email protected]
  S:    Maintained
  F:    arch/mips/lantiq
@@@ -6843,19 -6619,6 +6843,19 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    Documentation/powerpc/
  F:    arch/powerpc/
 +F:    drivers/char/tpm/tpm_ibmvtpm*
 +F:    drivers/crypto/nx/
 +F:    drivers/crypto/vmx/
 +F:    drivers/net/ethernet/ibm/ibmveth.*
 +F:    drivers/net/ethernet/ibm/ibmvnic.*
 +F:    drivers/pci/hotplug/rpa*
 +F:    drivers/scsi/ibmvscsi/
 +N:    opal
 +N:    /pmac
 +N:    powermac
 +N:    powernv
 +N:    [^a-z0-9]ps3
 +N:    pseries
  
  LINUX FOR POWER MACINTOSH
  M:    Benjamin Herrenschmidt <[email protected]>
@@@ -6936,7 -6699,6 +6936,7 @@@ F:      kernel/livepatch
  F:    include/linux/livepatch.h
  F:    arch/x86/include/asm/livepatch.h
  F:    arch/x86/kernel/livepatch.c
 +F:    Documentation/livepatch/
  F:    Documentation/ABI/testing/sysfs-kernel-livepatch
  F:    samples/livepatch/
  L:    [email protected]
@@@ -7025,6 -6787,12 +7025,6 @@@ W:     logfs.or
  S:    Maintained
  F:    fs/logfs/
  
 -LPC32XX MACHINE SUPPORT
 -M:    Roland Stigge <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/mach-lpc32xx/
 -
  LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
  M:    Sathya Prakash <[email protected]>
  M:    Chaitra P B <[email protected]>
@@@ -7151,8 -6919,6 +7151,8 @@@ MARVELL ARMADA DRM SUPPOR
  M:    Russell King <[email protected]>
  S:    Maintained
  F:    drivers/gpu/drm/armada/
 +F:    include/uapi/drm/armada_drm.h
 +F:    Documentation/devicetree/bindings/display/armada/
  
  MARVELL 88E6352 DSA support
  M:    Guenter Roeck <[email protected]>
@@@ -7517,15 -7283,6 +7517,15 @@@ S:    Supporte
  F:    Documentation/mips/
  F:    arch/mips/
  
 +MIPS/LOONGSON1 ARCHITECTURE
 +M:    Keguang Zhang <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/mips/loongson32/
 +F:    arch/mips/include/asm/mach-loongson32/
 +F:    drivers/*/*loongson1*
 +F:    drivers/*/*/*loongson1*
 +
  MIROSOUND PCM20 FM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
@@@ -7793,10 -7550,10 +7793,10 @@@ M:   Michael Schmitz <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/scsi/g_NCR5380.txt
 +F:    Documentation/scsi/dtc3x80.txt
  F:    drivers/scsi/NCR5380.*
  F:    drivers/scsi/arm/cumana_1.c
  F:    drivers/scsi/arm/oak.c
 -F:    drivers/scsi/atari_NCR5380.c
  F:    drivers/scsi/atari_scsi.*
  F:    drivers/scsi/dmx3191d.c
  F:    drivers/scsi/dtc.*
@@@ -8048,7 -7805,6 +8048,7 @@@ NILFS2 FILESYSTE
  M:    Ryusuke Konishi <[email protected]>
  L:    [email protected]
  W:    http://nilfs.sourceforge.net/
 +W:    http://nilfs.osdn.jp/
  T:    git git://github.com/konis/nilfs2.git
  S:    Supported
  F:    Documentation/filesystems/nilfs2.txt
@@@ -8429,6 -8185,7 +8429,6 @@@ F:      drivers/of/resolver.
  OPENRISC ARCHITECTURE
  M:    Jonas Bonn <[email protected]>
  W:    http://openrisc.net
 -L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://openrisc.net/~jonas/linux
  F:    arch/openrisc/
@@@ -8549,6 -8306,7 +8549,6 @@@ F:      drivers/platform/x86/panasonic-lapto
  
  PANASONIC MN10300/AM33/AM34 PORT
  M:    David Howells <[email protected]>
 -M:    Koichi Yasutake <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  W:    ftp://ftp.redhat.com/pub/redhat/gnupro/AM33/
  S:    Maintained
@@@ -8890,7 -8648,6 +8890,7 @@@ F:      arch/*/kernel/*/perf_event*.
  F:    arch/*/kernel/*/*/perf_event*.c
  F:    arch/*/include/asm/perf_event.h
  F:    arch/*/kernel/perf_callchain.c
 +F:    arch/*/events/*
  F:    tools/perf/
  
  PERSONALITY HANDLING
@@@ -8983,6 -8740,7 +8983,6 @@@ F:      drivers/pinctrl/pinctrl-single.
  
  PIN CONTROLLER - ST SPEAR
  M:    Viresh Kumar <[email protected]>
 -L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    http://www.st.com/spear
  S:    Maintained
@@@ -9444,7 -9202,7 +9444,7 @@@ S:      Maintaine
  F:    drivers/video/fbdev/aty/aty128fb.c
  
  RALINK MIPS ARCHITECTURE
 -M:    John Crispin <blogic@openwrt.org>
 +M:    John Crispin <john@phrozen.org>
  L:    [email protected]
  S:    Maintained
  F:    arch/mips/ralink
@@@ -9742,7 -9500,7 +9742,7 @@@ F:      drivers/net/wireless/realtek/rtlwifi
  RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
  M:    Jes Sorensen <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jes/linux.git rtl8723au-mac80211
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jes/linux.git rtl8xxxu-devel
  S:    Maintained
  F:    drivers/net/wireless/realtek/rtl8xxxu/
  
@@@ -10007,7 -9765,6 +10007,7 @@@ F:    drivers/mmc/host/dw_mmc
  SYSTEM TRACE MODULE CLASS
  M:    Alexander Shishkin <[email protected]>
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ash/stm.git
  F:    Documentation/trace/stm.txt
  F:    drivers/hwtracing/stm/
  F:    include/linux/stm.h
@@@ -10187,6 -9944,7 +10187,6 @@@ F:    drivers/mmc/host/sdhci-s3c
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER
  M:    Viresh Kumar <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/mmc/host/sdhci-spear.c
@@@ -10224,12 -9982,6 +10224,12 @@@ T:  git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    security/apparmor/
  
 +LOADPIN SECURITY MODULE
 +M:    Kees Cook <[email protected]>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git lsm/loadpin
 +S:    Supported
 +F:    security/loadpin/
 +
  YAMA SECURITY MODULE
  M:    Kees Cook <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git yama/tip
@@@ -10420,8 -10172,8 +10420,8 @@@ F:   arch/arm/mach-s3c24xx/bast-irq.
  TI DAVINCI MACHINE SUPPORT
  M:    Sekhar Nori <[email protected]>
  M:    Kevin Hilman <[email protected]>
 -T:    git git://gitorious.org/linux-davinci/linux-davinci.git
 -Q:    http://patchwork.kernel.org/project/linux-davinci/list/
 +L:    [email protected] (moderated for non-subscribers)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git
  S:    Supported
  F:    arch/arm/mach-davinci/
  F:    drivers/i2c/busses/i2c-davinci.c
@@@ -10749,6 -10501,7 +10749,6 @@@ F:   include/linux/compiler.
  SPEAR PLATFORM SUPPORT
  M:    Viresh Kumar <[email protected]>
  M:    Shiraz Hashim <[email protected]>
 -L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    http://www.st.com/spear
  S:    Maintained
@@@ -10757,6 -10510,7 +10757,6 @@@ F:   arch/arm/mach-spear
  
  SPEAR CLOCK FRAMEWORK SUPPORT
  M:    Viresh Kumar <[email protected]>
 -L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    http://www.st.com/spear
  S:    Maintained
@@@ -11199,11 -10953,10 +11199,11 @@@ M:        Prashant Gaikwad <[email protected]
  S:    Supported
  F:    drivers/clk/tegra/
  
 -TEGRA DMA DRIVER
 +TEGRA DMA DRIVERS
  M:    Laxman Dewangan <[email protected]>
 +M:    Jon Hunter <[email protected]>
  S:    Supported
 -F:    drivers/dma/tegra20-apb-dma.c
 +F:    drivers/dma/tegra*
  
  TEGRA I2C DRIVER
  M:    Laxman Dewangan <[email protected]>
@@@ -11305,7 -11058,6 +11305,7 @@@ F:   drivers/platform/x86/thinkpad_acpi.
  
  TI BANDGAP AND THERMAL DRIVER
  M:    Eduardo Valentin <[email protected]>
 +M:    Keerthy <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -11543,14 -11295,6 +11543,14 @@@ W: https://linuxtv.or
  S:    Odd Fixes
  F:    drivers/media/pci/tw68/
  
 +TW686X VIDEO4LINUX DRIVER
 +M:    Ezequiel Garcia <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/pci/tw686x/
 +
  TPM DEVICE DRIVER
  M:    Peter Huewe <[email protected]>
  M:    Marcel Selhorst <[email protected]>
@@@ -11669,8 -11413,7 +11669,8 @@@ F:   Documentation/filesystems/ubifs.tx
  F:    fs/ubifs/
  
  UCLINUX (M68KNOMMU AND COLDFIRE)
 -M:    Greg Ungerer <[email protected]>
 +M:    Greg Ungerer <[email protected]>
 +W:    http://www.linux-m68k.org/
  W:    http://www.uclinux.org/
  L:    [email protected]
  L:    [email protected]  (subscribers-only)
@@@ -12356,7 -12099,6 +12356,7 @@@ L:   [email protected]
  W:    http://www.linux-watchdog.org/
  T:    git git://www.linux-watchdog.org/linux-watchdog.git
  S:    Maintained
 +F:    Documentation/devicetree/bindings/watchdog/
  F:    Documentation/watchdog/
  F:    drivers/watchdog/
  F:    include/linux/watchdog.h
@@@ -12461,12 -12203,6 +12461,12 @@@ F: include/linux/workqueue.
  F:    kernel/workqueue.c
  F:    Documentation/workqueue.txt
  
 +X-POWERS MULTIFUNCTION PMIC DEVICE DRIVERS
 +M:    Chen-Yu Tsai <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +N:    axp[128]
 +
  X.25 NETWORK LAYER
  M:    Andrew Hendry <[email protected]>
  L:    [email protected]