Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 Jul 2018 16:53:45 +0000 (09:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 Jul 2018 16:53:45 +0000 (09:53 -0700)
Pull input fixes from Dmitry Torokhov:

 - a couple of new device IDs added to Elan i2c touchpad controller
   driver

 - another entry in i8042 reset quirk list

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: i8042 - add Lenovo LaVie Z to the i8042 reset list
  Input: elan_i2c - add another ACPI ID for Lenovo Ideapad 330-15AST
  MAINTAINERS: Add file patterns for serio device tree bindings
  Input: elan_i2c - add ACPI ID for lenovo ideapad 330

1  2 
MAINTAINERS

diff --combined MAINTAINERS
index 0fe4228f78cb8137861455514432f56f002b840f,4d769ce53ff1d667030aa75f700a05a6d45448b0..32fbc6f732d44da6bad368f00ecb000c52c3263f
@@@ -581,7 -581,7 +581,7 @@@ W: https://www.infradead.org/~dhowells/
  
  AGPGART DRIVER
  M:    David Airlie <airlied@linux.ie>
 -T:    git git://people.freedesktop.org/~airlied/linux (part of drm maint)
 +T:    git git://anongit.freedesktop.org/drm/drm
  S:    Maintained
  F:    drivers/char/agp/
  F:    include/linux/agp*
@@@ -767,14 -767,12 +767,14 @@@ F:      drivers/gpu/drm/amd/amdgpu/amdgpu_am
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
 +F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c
  F:    drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
  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/amd/include/v9_structs.h
  F:    include/uapi/linux/kfd_ioctl.h
  
  AMD SEATTLE DEVICE TREE SUPPORT
@@@ -796,14 -794,6 +796,14 @@@ M:       Michael Hanselmann <linux-kernel@han
  S:    Supported
  F:    drivers/macintosh/ams/
  
 +ANALOG DEVICES INC AD5686 DRIVER
 +M:    Stefan Popa <stefan.popa@analog.com>
 +L:    linux-pm@vger.kernel.org
 +W:    http://ez.analog.com/community/linux-device-drivers
 +S:    Supported
 +F:    drivers/iio/dac/ad5686*
 +F:    drivers/iio/dac/ad5696*
 +
  ANALOG DEVICES INC AD9389B DRIVER
  M:    Hans Verkuil <hans.verkuil@cisco.com>
  L:    linux-media@vger.kernel.org
@@@ -1143,12 -1133,10 +1143,12 @@@ F:   arch/arm/mach-actions
  F:    arch/arm/boot/dts/owl-*
  F:    arch/arm64/boot/dts/actions/
  F:    drivers/clocksource/owl-*
 +F:    drivers/pinctrl/actions/*
  F:    drivers/soc/actions/
  F:    include/dt-bindings/power/owl-*
  F:    include/linux/soc/actions/
  F:    Documentation/devicetree/bindings/arm/actions.txt
 +F:    Documentation/devicetree/bindings/pinctrl/actions,s900-pinctrl.txt
  F:    Documentation/devicetree/bindings/power/actions,owl-sps.txt
  F:    Documentation/devicetree/bindings/timer/actions,owl-timer.txt
  
@@@ -1419,7 -1407,6 +1419,7 @@@ M:      Shawn Guo <shawnguo@kernel.org
  M:    Sascha Hauer <s.hauer@pengutronix.de>
  R:    Pengutronix Kernel Team <kernel@pengutronix.de>
  R:    Fabio Estevam <fabio.estevam@nxp.com>
 +R:    NXP Linux Team <linux-imx@nxp.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
@@@ -1732,8 -1719,7 +1732,8 @@@ F:      arch/arm/mach-npcm
  F:    arch/arm/boot/dts/nuvoton-npcm*
  F:    include/dt-bindings/clock/nuvoton,npcm7xx-clks.h
  F:    drivers/*/*npcm*
 -F:    Documentation/*/*npcm*
 +F:    Documentation/devicetree/bindings/*/*npcm*
 +F:    Documentation/devicetree/bindings/*/*/*npcm*
  
  ARM/NUVOTON W90X900 ARM ARCHITECTURE
  M:    Wan ZongShun <mcuos.com@gmail.com>
@@@ -1831,7 -1817,7 +1831,7 @@@ F:      drivers/spi/spi-qup.
  F:    drivers/tty/serial/msm_serial.c
  F:    drivers/*/pm8???-*
  F:    drivers/mfd/ssbi.c
 -F:    drivers/firmware/qcom_scm.c
 +F:    drivers/firmware/qcom_scm*
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git
  
  ARM/RADISYS ENP2611 MACHINE SUPPORT
@@@ -2345,16 -2331,8 +2345,16 @@@ S:    Maintaine
  F:    drivers/gpio/gpio-ath79.c
  F:    Documentation/devicetree/bindings/gpio/gpio-ath79.txt
  
 +ATHEROS 71XX/9XXX USB PHY DRIVER
 +M:    Alban Bedel <albeu@free.fr>
 +W:    https://github.com/AlbanBedel/linux
 +T:    git git://github.com/AlbanBedel/linux
 +S:    Maintained
 +F:    drivers/phy/qualcomm/phy-ath79-usb.c
 +F:    Documentation/devicetree/bindings/phy/phy-ath79-usb.txt
 +
  ATHEROS ATH GENERIC UTILITIES
 -M:    "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
 +M:    Kalle Valo <kvalo@codeaurora.org>
  L:    linux-wireless@vger.kernel.org
  S:    Supported
  F:    drivers/net/wireless/ath/*
@@@ -2369,7 -2347,7 +2369,7 @@@ S:      Maintaine
  F:    drivers/net/wireless/ath/ath5k/
  
  ATHEROS ATH6KL WIRELESS DRIVER
 -M:    Kalle Valo <kvalo@qca.qualcomm.com>
 +M:    Kalle Valo <kvalo@codeaurora.org>
  L:    linux-wireless@vger.kernel.org
  W:    http://wireless.kernel.org/en/users/Drivers/ath6kl
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
@@@ -2523,7 -2501,7 +2523,7 @@@ S:      Supporte
  F:    drivers/scsi/esas2r
  
  ATUSB IEEE 802.15.4 RADIO DRIVER
 -M:    Stefan Schmidt <stefan@osg.samsung.com>
 +M:    Stefan Schmidt <stefan@datenfreihafen.org>
  L:    linux-wpan@vger.kernel.org
  S:    Maintained
  F:    drivers/net/ieee802154/atusb.c
@@@ -2543,6 -2521,8 +2543,6 @@@ F:      kernel/audit
  
  AUXILIARY DISPLAY DRIVERS
  M:    Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
 -W:    http://miguelojeda.es/auxdisplay.htm
 -W:    http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
  S:    Maintained
  F:    drivers/auxdisplay/
  F:    include/linux/cfag12864b.h
@@@ -2608,7 -2588,6 +2608,7 @@@ BACKLIGHT CLASS/SUBSYSTE
  M:    Lee Jones <lee.jones@linaro.org>
  M:    Daniel Thompson <daniel.thompson@linaro.org>
  M:    Jingoo Han <jingoohan1@gmail.com>
 +L:    dri-devel@lists.freedesktop.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git
  S:    Maintained
  F:    drivers/video/backlight/
@@@ -2743,13 -2722,13 +2743,13 @@@ L:   netdev@vger.kernel.or
  L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
 +Q:    https://patchwork.ozlabs.org/project/netdev/list/?delegate=77147
  S:    Supported
  F:    arch/x86/net/bpf_jit*
  F:    Documentation/networking/filter.txt
  F:    Documentation/bpf/
  F:    include/linux/bpf*
  F:    include/linux/filter.h
 -F:    include/trace/events/bpf.h
  F:    include/trace/events/xdp.h
  F:    include/uapi/linux/bpf*
  F:    include/uapi/linux/filter.h
@@@ -2762,7 -2741,6 +2762,7 @@@ F:      net/sched/act_bpf.
  F:    net/sched/cls_bpf.c
  F:    samples/bpf/
  F:    tools/bpf/
 +F:    tools/lib/bpf/
  F:    tools/testing/selftests/bpf/
  
  BROADCOM B44 10/100 ETHERNET DRIVER
@@@ -2971,13 -2949,9 +2971,13 @@@ N:    bcm585
  N:    bcm586*
  N:    bcm88312
  N:    hr2
 -F:    arch/arm64/boot/dts/broadcom/ns2*
 +N:    stingray
 +F:    arch/arm64/boot/dts/broadcom/northstar2/*
 +F:    arch/arm64/boot/dts/broadcom/stingray/*
  F:    drivers/clk/bcm/clk-ns*
 +F:    drivers/clk/bcm/clk-sr*
  F:    drivers/pinctrl/bcm/pinctrl-ns*
 +F:    include/dt-bindings/clock/bcm-sr*
  
  BROADCOM KONA GPIO DRIVER
  M:    Ray Jui <rjui@broadcom.com>
@@@ -3084,7 -3058,7 +3084,7 @@@ M:      Clemens Ladisch <clemens@ladisch.de
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  T:    git git://git.alsa-project.org/alsa-kernel.git
  S:    Maintained
 -F:    Documentation/sound/alsa/Bt87x.txt
 +F:    Documentation/sound/cards/bt87x.rst
  F:    sound/pci/bt87x.c
  
  BT8XXGPIO DRIVER
@@@ -3162,13 -3136,6 +3162,13 @@@ S:    Supporte
  F:    Documentation/filesystems/caching/cachefiles.txt
  F:    fs/cachefiles/
  
 +CADENCE MIPI-CSI2 BRIDGES
 +M:    Maxime Ripard <maxime.ripard@bootlin.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/cdns,*.txt
 +F:    drivers/media/platform/cadence/cdns-csi2*
 +
  CADET FM/AM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
@@@ -3380,7 -3347,7 +3380,7 @@@ M:      David Howells <dhowells@redhat.com
  M:    David Woodhouse <dwmw2@infradead.org>
  L:    keyrings@vger.kernel.org
  S:    Maintained
 -F:    Documentation/module-signing.txt
 +F:    Documentation/admin-guide/module-signing.rst
  F:    certs/
  F:    scripts/sign-file.c
  F:    scripts/extract-cert.c
@@@ -3397,12 -3364,16 +3397,12 @@@ F:   include/linux/usb/wusb
  
  CFAG12864B LCD DRIVER
  M:    Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
 -W:    http://miguelojeda.es/auxdisplay.htm
 -W:    http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
  S:    Maintained
  F:    drivers/auxdisplay/cfag12864b.c
  F:    include/linux/cfag12864b.h
  
  CFAG12864BFB LCD FRAMEBUFFER DRIVER
  M:    Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
 -W:    http://miguelojeda.es/auxdisplay.htm
 -W:    http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
  S:    Maintained
  F:    drivers/auxdisplay/cfag12864bfb.c
  F:    include/linux/cfag12864b.h
@@@ -3594,7 -3565,6 +3594,7 @@@ F:      drivers/clk
  X:    drivers/clk/clkdev.c
  F:    include/linux/clk-pr*
  F:    include/linux/clk/
 +F:    include/linux/of_clk.h
  
  COMMON INTERNET FILE SYSTEM (CIFS)
  M:    Steve French <sfrench@samba.org>
@@@ -4364,11 -4334,14 +4364,11 @@@ L:   iommu@lists.linux-foundation.or
  T:    git git://git.infradead.org/users/hch/dma-mapping.git
  W:    http://git.infradead.org/users/hch/dma-mapping.git
  S:    Supported
 -F:    lib/dma-debug.c
 -F:    lib/dma-direct.c
 -F:    lib/dma-virt.c
 -F:    drivers/base/dma-mapping.c
 -F:    drivers/base/dma-coherent.c
 +F:    kernel/dma/
  F:    include/asm-generic/dma-mapping.h
  F:    include/linux/dma-direct.h
  F:    include/linux/dma-mapping.h
 +F:    include/linux/dma-noncoherent.h
  
  DME1737 HARDWARE MONITOR DRIVER
  M:    Juerg Haefliger <juergh@gmail.com>
@@@ -4432,12 -4405,6 +4432,12 @@@ L:    linux-kernel@vger.kernel.or
  S:    Maintained
  F:    drivers/staging/fsl-dpaa2/ethsw
  
 +DPAA2 PTP CLOCK DRIVER
 +M:    Yangbo Lu <yangbo.lu@nxp.com>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    drivers/staging/fsl-dpaa2/rtc
 +
  DPT_I2O SCSI RAID DRIVER
  M:    Adaptec OEM Raid Solutions <aacraid@microsemi.com>
  L:    linux-scsi@vger.kernel.org
@@@ -4460,7 -4427,6 +4460,7 @@@ F:      Documentation/blockdev/drbd
  
  DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +R:    "Rafael J. Wysocki" <rafael@kernel.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
  S:    Supported
  F:    Documentation/kobject.txt
@@@ -4514,7 -4480,7 +4514,7 @@@ DRM DRIVER FOR ILITEK ILI9225 PANEL
  M:    David Lechner <david@lechnology.com>
  S:    Maintained
  F:    drivers/gpu/drm/tinydrm/ili9225.c
 -F:    Documentation/devicetree/bindings/display/ili9225.txt
 +F:    Documentation/devicetree/bindings/display/ilitek,ili9225.txt
  
  DRM DRIVER FOR INTEL I810 VIDEO CARDS
  S:    Orphan / Obsolete
@@@ -4600,13 -4566,13 +4600,13 @@@ DRM DRIVER FOR SITRONIX ST7586 PANEL
  M:    David Lechner <david@lechnology.com>
  S:    Maintained
  F:    drivers/gpu/drm/tinydrm/st7586.c
 -F:    Documentation/devicetree/bindings/display/st7586.txt
 +F:    Documentation/devicetree/bindings/display/sitronix,st7586.txt
  
  DRM DRIVER FOR SITRONIX ST7735R PANELS
  M:    David Lechner <david@lechnology.com>
  S:    Maintained
  F:    drivers/gpu/drm/tinydrm/st7735r.c
 -F:    Documentation/devicetree/bindings/display/st7735r.txt
 +F:    Documentation/devicetree/bindings/display/sitronix,st7735r.txt
  
  DRM DRIVER FOR TDFX VIDEO CARDS
  S:    Orphan / Obsolete
@@@ -4631,7 -4597,7 +4631,7 @@@ F:      include/uapi/drm/vmwgfx_drm.
  DRM DRIVERS
  M:    David Airlie <airlied@linux.ie>
  L:    dri-devel@lists.freedesktop.org
 -T:    git git://people.freedesktop.org/~airlied/linux
 +T:    git git://anongit.freedesktop.org/drm/drm
  B:    https://bugs.freedesktop.org/
  C:    irc://chat.freenode.net/dri-devel
  S:    Maintained
@@@ -4639,6 -4605,7 +4639,6 @@@ F:      drivers/gpu/drm
  F:    drivers/gpu/vga/
  F:    Documentation/devicetree/bindings/display/
  F:    Documentation/devicetree/bindings/gpu/
 -F:    Documentation/devicetree/bindings/video/
  F:    Documentation/gpu/
  F:    include/drm/
  F:    include/uapi/drm/
@@@ -4683,7 -4650,7 +4683,7 @@@ M:      Boris Brezillon <boris.brezillon@boo
  L:    dri-devel@lists.freedesktop.org
  S:    Supported
  F:    drivers/gpu/drm/atmel-hlcdc/
 -F:    Documentation/devicetree/bindings/drm/atmel/
 +F:    Documentation/devicetree/bindings/display/atmel/
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  DRM DRIVERS FOR BRIDGE CHIPS
@@@ -4708,13 -4675,13 +4708,13 @@@ F:   Documentation/devicetree/bindings/di
  
  DRM DRIVERS FOR FREESCALE DCU
  M:    Stefan Agner <stefan@agner.ch>
 -M:    Alison Wang <alison.wang@freescale.com>
 +M:    Alison Wang <alison.wang@nxp.com>
  L:    dri-devel@lists.freedesktop.org
  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
 +F:    Documentation/devicetree/bindings/display/panel/nec,nl4827hc19-05b.txt
  
  DRM DRIVERS FOR FREESCALE IMX
  M:    Philipp Zabel <p.zabel@pengutronix.de>
@@@ -4819,14 -4786,6 +4819,14 @@@ S:    Maintaine
  F:    drivers/gpu/drm/omapdrm/
  F:    Documentation/devicetree/bindings/display/ti/
  
 +DRM DRIVERS FOR V3D
 +M:    Eric Anholt <eric@anholt.net>
 +S:    Supported
 +F:    drivers/gpu/drm/v3d/
 +F:    include/uapi/drm/v3d_drm.h
 +F:    Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.txt
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +
  DRM DRIVERS FOR VC4
  M:    Eric Anholt <eric@anholt.net>
  T:    git git://github.com/anholt/linux
@@@ -4873,15 -4832,6 +4873,15 @@@ S:    Maintaine
  F:    drivers/gpu/drm/tinydrm/
  F:    include/drm/tinydrm/
  
 +DRM DRIVERS FOR XEN
 +M:    Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +L:    dri-devel@lists.freedesktop.org
 +L:    xen-devel@lists.xen.org
 +S:    Supported
 +F:    drivers/gpu/drm/xen/
 +F:    Documentation/gpu/xen-front.rst
 +
  DRM TTM SUBSYSTEM
  M:    Christian Koenig <christian.koenig@amd.com>
  M:    Roger He <Hongbo.He@amd.com>
@@@ -5373,6 -5323,7 +5373,6 @@@ F:      include/linux/*mdio*.
  F:    include/linux/of_net.h
  F:    include/linux/phy.h
  F:    include/linux/phy_fixed.h
 -F:    include/linux/platform_data/mdio-gpio.h
  F:    include/linux/platform_data/mdio-bcm-unimac.h
  F:    include/trace/events/mdio.h
  F:    include/uapi/linux/mdio.h
@@@ -5443,6 -5394,7 +5443,6 @@@ S:      Maintaine
  F:    drivers/iommu/exynos-iommu.c
  
  EZchip NPS platform support
 -M:    Elad Kanfi <eladkan@mellanox.com>
  M:    Vineet Gupta <vgupta@synopsys.com>
  S:    Supported
  F:    arch/arc/plat-eznps
@@@ -5468,19 -5420,6 +5468,19 @@@ S:    Maintaine
  F:    Documentation/hwmon/f71805f
  F:    drivers/hwmon/f71805f.c
  
 +FADDR2LINE
 +M:    Josh Poimboeuf <jpoimboe@redhat.com>
 +S:    Maintained
 +F:    scripts/faddr2line
 +
 +FAILOVER MODULE
 +M:    Sridhar Samudrala <sridhar.samudrala@intel.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    net/core/failover.c
 +F:    include/net/failover.h
 +F:    Documentation/networking/failover.rst
 +
  FANOTIFY
  M:    Jan Kara <jack@suse.cz>
  R:    Amir Goldstein <amir73il@gmail.com>
@@@ -5633,7 -5572,6 +5633,7 @@@ S:      Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/atull/linux-fpga.git
  Q:    http://patchwork.kernel.org/project/linux-fpga/list/
  F:    Documentation/fpga/
 +F:    Documentation/driver-api/fpga/
  F:    Documentation/devicetree/bindings/fpga/
  F:    drivers/fpga/
  F:    include/linux/fpga/
@@@ -5674,7 -5612,7 +5674,7 @@@ F:      drivers/crypto/caam
  F:    Documentation/devicetree/bindings/crypto/fsl-sec4.txt
  
  FREESCALE DIU FRAMEBUFFER DRIVER
 -M:    Timur Tabi <timur@tabi.org>
 +M:    Timur Tabi <timur@kernel.org>
  L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    drivers/video/fbdev/fsl-diu-fb.*
@@@ -5691,6 -5629,7 +5691,6 @@@ M:      Claudiu Manoil <claudiu.manoil@nxp.c
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/ethernet/freescale/gianfar*
 -X:    drivers/net/ethernet/freescale/gianfar_ptp.c
  F:    Documentation/devicetree/bindings/net/fsl-tsec-phy.txt
  
  FREESCALE GPMI NAND DRIVER
@@@ -5735,15 -5674,7 +5735,15 @@@ M:    Madalin Bucur <madalin.bucur@nxp.com
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/ethernet/freescale/fman
 -F:    Documentation/devicetree/bindings/powerpc/fsl/fman.txt
 +F:    Documentation/devicetree/bindings/net/fsl-fman.txt
 +
 +FREESCALE QORIQ PTP CLOCK DRIVER
 +M:    Yangbo Lu <yangbo.lu@nxp.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/ptp/ptp_qoriq.c
 +F:    include/linux/fsl/ptp_qoriq.h
 +F:    Documentation/devicetree/bindings/ptp/ptp-qoriq.txt
  
  FREESCALE QUAD SPI DRIVER
  M:    Han Xu <han.xu@nxp.com>
@@@ -5774,7 -5705,7 +5774,7 @@@ S:      Maintaine
  F:    drivers/net/wan/fsl_ucc_hdlc*
  
  FREESCALE QUICC ENGINE UCC UART DRIVER
 -M:    Timur Tabi <timur@tabi.org>
 +M:    Timur Tabi <timur@kernel.org>
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Maintained
  F:    drivers/tty/serial/ucc_uart.c
@@@ -5790,6 -5721,7 +5790,6 @@@ F:      include/linux/fsl
  
  FREESCALE SOC FS_ENET DRIVER
  M:    Pantelis Antoniou <pantelis.antoniou@gmail.com>
 -M:    Vitaly Bordug <vbordug@ru.mvista.com>
  L:    linuxppc-dev@lists.ozlabs.org
  L:    netdev@vger.kernel.org
  S:    Maintained
@@@ -5797,7 -5729,7 +5797,7 @@@ F:      drivers/net/ethernet/freescale/fs_en
  F:    include/linux/fs_enet_pd.h
  
  FREESCALE SOC SOUND DRIVERS
 -M:    Timur Tabi <timur@tabi.org>
 +M:    Timur Tabi <timur@kernel.org>
  M:    Nicolin Chen <nicoleotsuka@gmail.com>
  M:    Xiubo Li <Xiubo.Lee@gmail.com>
  R:    Fabio Estevam <fabio.estevam@nxp.com>
@@@ -5952,14 -5884,14 +5952,14 @@@ GENERIC GPIO I2C DRIVE
  M:    Haavard Skinnemoen <hskinnemoen@gmail.com>
  S:    Supported
  F:    drivers/i2c/busses/i2c-gpio.c
 -F:    include/linux/i2c-gpio.h
 +F:    include/linux/platform_data/i2c-gpio.h
  
  GENERIC GPIO I2C MULTIPLEXER DRIVER
  M:    Peter Korsgaard <peter.korsgaard@barco.com>
  L:    linux-i2c@vger.kernel.org
  S:    Supported
  F:    drivers/i2c/muxes/i2c-mux-gpio.c
 -F:    include/linux/i2c-mux-gpio.h
 +F:    include/linux/platform_data/i2c-mux-gpio.h
  F:    Documentation/i2c/muxes/i2c-mux-gpio
  
  GENERIC HDLC (WAN) DRIVERS
@@@ -6023,8 -5955,8 +6023,8 @@@ S:      Maintaine
  F:    scripts/get_maintainer.pl
  
  GFS2 FILE SYSTEM
 -M:    Steven Whitehouse <swhiteho@redhat.com>
  M:    Bob Peterson <rpeterso@redhat.com>
 +M:    Andreas Gruenbacher <agruenba@redhat.com>
  L:    cluster-devel@redhat.com
  W:    http://sources.redhat.com/cluster/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git
@@@ -6292,7 -6224,6 +6292,7 @@@ L:      linux-hwmon@vger.kernel.or
  W:    http://hwmon.wiki.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
  S:    Maintained
 +F:    Documentation/devicetree/bindings/hwmon/
  F:    Documentation/hwmon/
  F:    drivers/hwmon/
  F:    include/linux/hwmon*.h
@@@ -6500,7 -6431,7 +6500,7 @@@ L:      linux-mm@kvack.or
  S:    Maintained
  F:    mm/hmm*
  F:    include/linux/hmm*
 -F:    Documentation/vm/hmm.txt
 +F:    Documentation/vm/hmm.rst
  
  HOST AP DRIVER
  M:    Jouni Malinen <j@w1.fi>
@@@ -6579,15 -6510,9 +6579,15 @@@ F:    Documentation/networking/hinic.tx
  F:    drivers/net/ethernet/huawei/hinic/
  
  HUGETLB FILESYSTEM
 -M:    Nadia Yvette Chambers <nyc@holomorphy.com>
 +M:    Mike Kravetz <mike.kravetz@oracle.com>
 +L:    linux-mm@kvack.org
  S:    Maintained
  F:    fs/hugetlbfs/
 +F:    mm/hugetlb.c
 +F:    include/linux/hugetlb.h
 +F:    Documentation/admin-guide/mm/hugetlbpage.rst
 +F:    Documentation/vm/hugetlbfs_reserv.rst
 +F:    Documentation/ABI/testing/sysfs-kernel-mm-hugepages
  
  HVA ST MEDIA DRIVER
  M:    Jean-Christophe Trotin <jean-christophe.trotin@st.com>
@@@ -6619,7 -6544,7 +6619,7 @@@ F:      arch/x86/hyper
  F:    drivers/hid/hid-hyperv.c
  F:    drivers/hv/
  F:    drivers/input/serio/hyperv-keyboard.c
 -F:    drivers/pci/host/pci-hyperv.c
 +F:    drivers/pci/controller/pci-hyperv.c
  F:    drivers/net/hyperv/
  F:    drivers/scsi/storvsc_drv.c
  F:    drivers/uio/uio_hv_generic.c
@@@ -6827,12 -6752,6 +6827,12 @@@ L:    linux-scsi@vger.kernel.or
  S:    Supported
  F:    drivers/scsi/ibmvscsi/ibmvfc*
  
 +IBM Power Virtual Management Channel Driver
 +M:    Bryant G. Ly <bryantly@linux.vnet.ibm.com>
 +M:    Steven Royer <seroyer@linux.vnet.ibm.com>
 +S:    Supported
 +F:    drivers/misc/ibmvmc.*
 +
  IBM Power Virtual SCSI Device Drivers
  M:    Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
  L:    linux-scsi@vger.kernel.org
@@@ -6908,7 -6827,7 +6908,7 @@@ F:      drivers/clk/clk-versaclock5.
  
  IEEE 802.15.4 SUBSYSTEM
  M:    Alexander Aring <alex.aring@gmail.com>
 -M:    Stefan Schmidt <stefan@osg.samsung.com>
 +M:    Stefan Schmidt <stefan@datenfreihafen.org>
  L:    linux-wpan@vger.kernel.org
  W:    http://wpan.cakelab.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan.git
@@@ -6965,7 -6884,7 +6965,7 @@@ IIO MULTIPLEXE
  M:    Peter Rosin <peda@axentia.se>
  L:    linux-iio@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/iio/multiplexer/iio-mux.txt
 +F:    Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.txt
  F:    drivers/iio/multiplexer/iio-mux.c
  
  IIO SUBSYSTEM AND DRIVERS
@@@ -6984,15 -6903,6 +6984,15 @@@ F:    drivers/staging/iio
  F:    include/linux/iio/
  F:    tools/iio/
  
 +IIO UNIT CONVERTER
 +M:    Peter Rosin <peda@axentia.se>
 +L:    linux-iio@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/iio/afe/current-sense-amplifier.txt
 +F:    Documentation/devicetree/bindings/iio/afe/current-sense-shunt.txt
 +F:    Documentation/devicetree/bindings/iio/afe/voltage-divider.txt
 +F:    drivers/iio/afe/iio-rescale.c
 +
  IKANOS/ADI EAGLE ADSL USB DRIVER
  M:    Matthieu Castet <castet.matthieu@free.fr>
  M:    Stanislaw Gruszka <stf_xl@wp.pl>
@@@ -7095,6 -7005,7 +7095,7 @@@ F:      include/uapi/linux/input.
  F:    include/uapi/linux/input-event-codes.h
  F:    include/linux/input/
  F:    Documentation/devicetree/bindings/input/
+ F:    Documentation/devicetree/bindings/serio/
  F:    Documentation/input/
  
  INPUT MULTITOUCH (MT) PROTOCOL
@@@ -7125,13 -7036,14 +7126,13 @@@ L:   linux-fbdev@vger.kernel.or
  S:    Maintained
  F:    drivers/video/fbdev/i810/
  
 -INTEL ASoC BDW/HSW DRIVERS
 +INTEL ASoC DRIVERS
 +M:    Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
 +M:    Liam Girdwood <liam.r.girdwood@linux.intel.com>
  M:    Jie Yang <yang.jie@linux.intel.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Supported
 -F:    sound/soc/intel/common/sst-dsp*
 -F:    sound/soc/intel/common/sst-firmware.c
 -F:    sound/soc/intel/boards/broadwell.c
 -F:    sound/soc/intel/haswell/
 +F:    sound/soc/intel/
  
  INTEL C600 SERIES SAS CONTROLLER DRIVER
  M:    Intel SCU Linux support <intel-linux-scu@intel.com>
@@@ -7166,8 -7078,8 +7167,8 @@@ Q:      http://patchwork.ozlabs.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git
  S:    Supported
 -F:    Documentation/networking/e100.txt
 -F:    Documentation/networking/e1000.txt
 +F:    Documentation/networking/e100.rst
 +F:    Documentation/networking/e1000.rst
  F:    Documentation/networking/e1000e.txt
  F:    Documentation/networking/igb.txt
  F:    Documentation/networking/igbvf.txt
@@@ -7400,7 -7312,7 +7401,7 @@@ F:      drivers/platform/x86/intel-wmi-thund
  INTEL(R) TRACE HUB
  M:    Alexander Shishkin <alexander.shishkin@linux.intel.com>
  S:    Supported
 -F:    Documentation/trace/intel_th.txt
 +F:    Documentation/trace/intel_th.rst
  F:    drivers/hwtracing/intel_th/
  
  INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
@@@ -7424,7 -7336,7 +7425,7 @@@ M:      Linus Walleij <linus.walleij@linaro.
  L:    linux-iio@vger.kernel.org
  S:    Maintained
  F:    drivers/iio/gyro/mpu3050*
 -F:    Documentation/devicetree/bindings/iio/gyroscope/inv,mpu3050.txt
 +F:    Documentation/devicetree/bindings/iio/gyroscope/invensense,mpu3050.txt
  
  IOC3 ETHERNET DRIVER
  M:    Ralf Baechle <ralf@linux-mips.org>
@@@ -7727,9 -7639,8 +7728,9 @@@ M:      Masahiro Yamada <yamada.masahiro@soc
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kconfig
  L:    linux-kbuild@vger.kernel.org
  S:    Maintained
 -F:    Documentation/kbuild/kconfig-language.txt
 +F:    Documentation/kbuild/kconfig*
  F:    scripts/kconfig/
 +F:    scripts/Kconfig.include
  
  KDUMP
  M:    Dave Young <dyoung@redhat.com>
@@@ -7748,11 -7659,11 +7749,11 @@@ W:   https://linuxtv.or
  S:    Maintained
  F:    drivers/media/radio/radio-keene*
  
 -KERNEL AUTOMOUNTER v4 (AUTOFS4)
 +KERNEL AUTOMOUNTER
  M:    Ian Kent <raven@themaw.net>
  L:    autofs@vger.kernel.org
  S:    Maintained
 -F:    fs/autofs4/
 +F:    fs/autofs/
  
  KERNEL BUILD + files below scripts/ (unless maintained elsewhere)
  M:    Masahiro Yamada <yamada.masahiro@socionext.com>
@@@ -7996,6 -7907,8 +7997,6 @@@ F:      kernel/kprobes.
  
  KS0108 LCD CONTROLLER DRIVER
  M:    Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
 -W:    http://miguelojeda.es/auxdisplay.htm
 -W:    http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
  S:    Maintained
  F:    Documentation/auxdisplay/ks0108
  F:    drivers/auxdisplay/ks0108.c
@@@ -8053,13 -7966,6 +8054,13 @@@ S:    Maintaine
  F:    Documentation/misc-devices/eeprom
  F:    drivers/misc/eeprom/eeprom.c
  
 +LEGO MINDSTORMS EV3
 +R:    David Lechner <david@lechnology.com>
 +S:    Maintained
 +F:    arch/arm/boot/dts/da850-lego-ev3.dts
 +F:    Documentation/devicetree/bindings/power/supply/lego_ev3_battery.txt
 +F:    drivers/power/supply/lego_ev3_battery.c
 +
  LEGO USB Tower driver
  M:    Juergen Stuber <starblue@users.sourceforge.net>
  L:    legousb-devel@lists.sourceforge.net
@@@ -8305,7 -8211,7 +8306,7 @@@ F:      drivers/misc/lkdtm/
  
  LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)
  M:    Alan Stern <stern@rowland.harvard.edu>
 -M:    Andrea Parri <parri.andrea@gmail.com>
 +M:    Andrea Parri <andrea.parri@amarulasolutions.com>
  M:    Will Deacon <will.deacon@arm.com>
  M:    Peter Zijlstra <peterz@infradead.org>
  M:    Boqun Feng <boqun.feng@gmail.com>
@@@ -8412,7 -8318,6 +8413,7 @@@ F:      Documentation/admin-guide/LSM/LoadPi
  LOCKING PRIMITIVES
  M:    Peter Zijlstra <peterz@infradead.org>
  M:    Ingo Molnar <mingo@redhat.com>
 +M:    Will Deacon <will.deacon@arm.com>
  L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
  S:    Maintained
@@@ -8447,6 -8352,7 +8448,6 @@@ L:      linux-scsi@vger.kernel.or
  W:    http://www.avagotech.com/support/
  S:    Supported
  F:    drivers/message/fusion/
 -F:    drivers/scsi/mpt2sas/
  F:    drivers/scsi/mpt3sas/
  
  LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers
@@@ -8568,7 -8474,6 +8569,7 @@@ M:      Vivien Didelot <vivien.didelot@savoi
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/dsa/mv88e6xxx/
 +F:    linux/platform_data/mv88e6xxx.h
  F:    Documentation/devicetree/bindings/net/dsa/marvell.txt
  
  MARVELL ARMADA DRM SUPPORT
@@@ -8628,7 -8533,7 +8629,7 @@@ MARVELL MWIFIEX WIRELESS DRIVE
  M:    Amitkumar Karwar <amitkarwar@gmail.com>
  M:    Nishant Sarmukadam <nishants@marvell.com>
  M:    Ganapathi Bhat <gbhat@marvell.com>
 -M:    Xinming Hu <huxm@marvell.com>
 +M:    Xinming Hu <huxinming820@gmail.com>
  L:    linux-wireless@vger.kernel.org
  S:    Maintained
  F:    drivers/net/wireless/marvell/mwifiex/
@@@ -8699,7 -8604,7 +8700,7 @@@ M:      Guenter Roeck <linux@roeck-us.net
  L:    linux-hwmon@vger.kernel.org
  S:    Maintained
  F:    Documentation/hwmon/max6697
 -F:    Documentation/devicetree/bindings/i2c/max6697.txt
 +F:    Documentation/devicetree/bindings/hwmon/max6697.txt
  F:    drivers/hwmon/max6697.c
  F:    include/linux/platform_data/max6697.h
  
@@@ -8926,7 -8831,6 +8927,7 @@@ L:      linux-media@vger.kernel.or
  L:    linux-renesas-soc@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
 +F:    Documentation/devicetree/bindings/media/renesas,rcar-csi2.txt
  F:    Documentation/devicetree/bindings/media/rcar_vin.txt
  F:    drivers/media/platform/rcar-vin/
  
@@@ -9053,13 -8957,6 +9054,13 @@@ L:    linux-wireless@vger.kernel.or
  S:    Maintained
  F:    drivers/net/wireless/mediatek/mt7601u/
  
 +MEDIATEK NAND CONTROLLER DRIVER
 +M:    Xiaolei Li <xiaolei.li@mediatek.com>
 +L:    linux-mtd@lists.infradead.org
 +S:    Maintained
 +F:    drivers/mtd/nand/raw/mtk_*
 +F:    Documentation/devicetree/bindings/mtd/mtk-nand.txt
 +
  MEDIATEK RANDOM NUMBER GENERATOR SUPPORT
  M:    Sean Wang <sean.wang@mediatek.com>
  S:    Maintained
@@@ -9074,12 -8971,12 +9075,12 @@@ S:   Maintaine
  F:    drivers/usb/mtu3/
  
  MEGACHIPS STDPXXXX-GE-B850V3-FW LVDS/DP++ BRIDGES
 -M:    Peter Senna Tschudin <peter.senna@collabora.com>
 +M:    Peter Senna Tschudin <peter.senna@gmail.com>
  M:    Martin Donnelly <martin.donnelly@ge.com>
  M:    Martyn Welch <martyn.welch@collabora.co.uk>
  S:    Maintained
  F:    drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
 -F:    Documentation/devicetree/bindings/video/bridge/megachips-stdpxxxx-ge-b850v3-fw.txt
 +F:    Documentation/devicetree/bindings/display/bridge/megachips-stdpxxxx-ge-b850v3-fw.txt
  
  MEGARAID SCSI/SAS DRIVERS
  M:    Kashyap Desai <kashyap.desai@broadcom.com>
@@@ -9130,18 -9027,18 +9131,18 @@@ W:   http://www.mellanox.co
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
  F:    drivers/net/ethernet/mellanox/mlx5/core/en_*
  
 -MELLANOX ETHERNET INNOVA DRIVER
 -M:    Ilan Tayari <ilant@mellanox.com>
 +MELLANOX ETHERNET INNOVA DRIVERS
  R:    Boris Pismenny <borisp@mellanox.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  W:    http://www.mellanox.com
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
 +F:    drivers/net/ethernet/mellanox/mlx5/core/en_accel/*
 +F:    drivers/net/ethernet/mellanox/mlx5/core/accel/*
  F:    drivers/net/ethernet/mellanox/mlx5/core/fpga/*
  F:    include/linux/mlx5/mlx5_ifc_fpga.h
  
  MELLANOX ETHERNET INNOVA IPSEC DRIVER
 -M:    Ilan Tayari <ilant@mellanox.com>
  R:    Boris Pismenny <borisp@mellanox.com>
  L:    netdev@vger.kernel.org
  S:    Supported
@@@ -9197,6 -9094,7 +9198,6 @@@ F:      include/uapi/rdma/mlx4-abi.
  
  MELLANOX MLX5 core VPI driver
  M:    Saeed Mahameed <saeedm@mellanox.com>
 -M:    Matan Barak <matanb@mellanox.com>
  M:    Leon Romanovsky <leonro@mellanox.com>
  L:    netdev@vger.kernel.org
  L:    linux-rdma@vger.kernel.org
@@@ -9207,6 -9105,7 +9208,6 @@@ F:      drivers/net/ethernet/mellanox/mlx5/c
  F:    include/linux/mlx5/
  
  MELLANOX MLX5 IB driver
 -M:    Matan Barak <matanb@mellanox.com>
  M:    Leon Romanovsky <leonro@mellanox.com>
  L:    linux-rdma@vger.kernel.org
  W:    http://www.mellanox.com
@@@ -9397,12 -9296,6 +9398,12 @@@ F:    include/linux/cciss*.
  F:    include/uapi/linux/cciss*.h
  F:    Documentation/scsi/smartpqi.txt
  
 +MICROSEMI ETHERNET SWITCH DRIVER
 +M:    Alexandre Belloni <alexandre.belloni@bootlin.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    drivers/net/ethernet/mscc/
 +
  MICROSOFT SURFACE PRO 3 BUTTON DRIVER
  M:    Chen Yu <yu.c.chen@intel.com>
  L:    platform-driver-x86@vger.kernel.org
@@@ -9416,12 -9309,10 +9417,12 @@@ F:   drivers/usb/image/microtek.
  
  MIPS
  M:    Ralf Baechle <ralf@linux-mips.org>
 +M:    Paul Burton <paul.burton@mips.com>
  M:    James Hogan <jhogan@kernel.org>
  L:    linux-mips@linux-mips.org
  W:    http://www.linux-mips.org/
  T:    git git://git.linux-mips.org/pub/scm/ralf/linux.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git
  Q:    http://patchwork.linux-mips.org/project/linux-mips/list/
  S:    Supported
  F:    Documentation/devicetree/bindings/mips/
@@@ -9518,13 -9409,6 +9519,13 @@@ Q:    http://patchwork.linuxtv.org/project
  S:    Maintained
  F:    drivers/media/dvb-frontends/mn88473*
  
 +PCI DRIVER FOR MOBIVEIL PCIE IP
 +M:    Subrahmanya Lingappa <l.subrahmanya@mobiveil.co.in>
 +L:    linux-pci@vger.kernel.org
 +S:    Supported
 +F:    Documentation/devicetree/bindings/pci/mobiveil-pcie.txt
 +F:    drivers/pci/controller/pcie-mobiveil.c
 +
  MODULE SUPPORT
  M:    Jessica Yu <jeyu@kernel.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules-next
@@@ -9664,7 -9548,7 +9665,7 @@@ F:      include/uapi/linux/mmc
  MULTIPLEXER SUBSYSTEM
  M:    Peter Rosin <peda@axentia.se>
  S:    Maintained
 -F:    Documentation/ABI/testing/mux/sysfs-class-mux*
 +F:    Documentation/ABI/testing/sysfs-class-mux*
  F:    Documentation/devicetree/bindings/mux/
  F:    include/linux/dt-bindings/mux/
  F:    include/linux/mux/
@@@ -9695,7 -9579,7 +9696,7 @@@ MXSFB DRM DRIVE
  M:    Marek Vasut <marex@denx.de>
  S:    Supported
  F:    drivers/gpu/drm/mxsfb/
 -F:    Documentation/devicetree/bindings/display/mxsfb-drm.txt
 +F:    Documentation/devicetree/bindings/display/mxsfb.txt
  
  MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
  M:    Chris Lee <christopher.lee@cspi.com>
@@@ -9706,7 -9590,6 +9707,7 @@@ F:      drivers/net/ethernet/myricom/myri10g
  
  NAND FLASH SUBSYSTEM
  M:    Boris Brezillon <boris.brezillon@bootlin.com>
 +M:    Miquel Raynal <miquel.raynal@bootlin.com>
  R:    Richard Weinberger <richard@nod.at>
  L:    linux-mtd@lists.infradead.org
  W:    http://www.linux-mtd.infradead.org/
@@@ -9755,11 -9638,6 +9756,11 @@@ L:    linux-scsi@vger.kernel.or
  S:    Maintained
  F:    drivers/scsi/NCR_D700.*
  
 +NCSI LIBRARY:
 +M:    Samuel Mendoza-Jonas <sam@mendozajonas.com>
 +S:    Maintained
 +F:    net/ncsi/
 +
  NCT6775 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    linux-hwmon@vger.kernel.org
@@@ -9767,14 -9645,6 +9768,14 @@@ S:    Maintaine
  F:    Documentation/hwmon/nct6775
  F:    drivers/hwmon/nct6775.c
  
 +NET_FAILOVER MODULE
 +M:    Sridhar Samudrala <sridhar.samudrala@intel.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    driver/net/net_failover.c
 +F:    include/net/net_failover.h
 +F:    Documentation/networking/net_failover.rst
 +
  NETEFFECT IWARP RNIC DRIVER (IW_NES)
  M:    Faisal Latif <faisal.latif@intel.com>
  L:    linux-rdma@vger.kernel.org
@@@ -9836,7 -9706,7 +9837,7 @@@ S:      Maintaine
  F:    drivers/net/ethernet/netronome/
  
  NETWORK BLOCK DEVICE (NBD)
 -M:    Josef Bacik <jbacik@fb.com>
 +M:    Josef Bacik <josef@toxicpanda.com>
  S:    Maintained
  L:    linux-block@vger.kernel.org
  L:    nbd@other.debian.org
@@@ -9886,7 -9756,6 +9887,7 @@@ M:      Andrew Lunn <andrew@lunn.ch
  M:    Vivien Didelot <vivien.didelot@savoirfairelinux.com>
  M:    Florian Fainelli <f.fainelli@gmail.com>
  S:    Maintained
 +F:    Documentation/devicetree/bindings/net/dsa/
  F:    net/dsa/
  F:    include/net/dsa.h
  F:    include/linux/dsa/
@@@ -9969,21 -9838,8 +9970,21 @@@ F:    net/ipv6/calipso.
  F:    net/netfilter/xt_CONNSECMARK.c
  F:    net/netfilter/xt_SECMARK.c
  
 +NETWORKING [TCP]
 +M:    Eric Dumazet <edumazet@google.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    net/ipv4/tcp*.c
 +F:    net/ipv4/syncookies.c
 +F:    net/ipv6/tcp*.c
 +F:    net/ipv6/syncookies.c
 +F:    include/uapi/linux/tcp.h
 +F:    include/net/tcp.h
 +F:    include/linux/tcp.h
 +F:    include/trace/events/tcp.h
 +
  NETWORKING [TLS]
 -M:    Ilya Lesokhin <ilyal@mellanox.com>
 +M:    Boris Pismenny <borisp@mellanox.com>
  M:    Aviad Yehezkel <aviadye@mellanox.com>
  M:    Dave Watson <davejwatson@fb.com>
  L:    netdev@vger.kernel.org
@@@ -10213,13 -10069,11 +10214,13 @@@ F:        sound/soc/codecs/sgtl5000
  
  NXP TDA998X DRM DRIVER
  M:    Russell King <linux@armlinux.org.uk>
 -S:    Supported
 +S:    Maintained
  T:    git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-devel
  T:    git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-fixes
  F:    drivers/gpu/drm/i2c/tda998x_drv.c
  F:    include/drm/i2c/tda998x.h
 +F:    include/dt-bindings/display/tda998x.h
 +K:    "nxp,tda998x"
  
  NXP TFA9879 DRIVER
  M:    Peter Rosin <peda@axentia.se>
@@@ -10251,7 -10105,7 +10252,7 @@@ F:   arch/powerpc/include/asm/pnv-ocxl.
  F:    drivers/misc/ocxl/
  F:    include/misc/ocxl*
  F:    include/uapi/misc/ocxl.h
 -F:    Documentation/accelerators/ocxl.txt
 +F:    Documentation/accelerators/ocxl.rst
  
  OMAP AUDIO SUPPORT
  M:    Peter Ujfalusi <peter.ujfalusi@ti.com>
@@@ -10280,16 -10134,18 +10281,16 @@@ F:        arch/arm/boot/dts/*am5
  F:    arch/arm/boot/dts/*dra7*
  
  OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)
 -M:    Tomi Valkeinen <tomi.valkeinen@ti.com>
  L:    linux-omap@vger.kernel.org
  L:    linux-fbdev@vger.kernel.org
 -S:    Maintained
 +S:    Orphan
  F:    drivers/video/fbdev/omap2/
  F:    Documentation/arm/OMAP/DSS
  
  OMAP FRAMEBUFFER SUPPORT
 -M:    Tomi Valkeinen <tomi.valkeinen@ti.com>
  L:    linux-fbdev@vger.kernel.org
  L:    linux-omap@vger.kernel.org
 -S:    Maintained
 +S:    Orphan
  F:    drivers/video/fbdev/omap/
  
  OMAP GENERAL PURPOSE MEMORY CONTROLLER SUPPORT
@@@ -10397,7 -10253,7 +10398,7 @@@ F:   arch/arm/mach-omap1
  F:    arch/arm/plat-omap/
  F:    arch/arm/configs/omap1_defconfig
  F:    drivers/i2c/busses/i2c-omap.c
 -F:    include/linux/i2c-omap.h
 +F:    include/linux/platform_data/i2c-omap.h
  
  OMAP2+ SUPPORT
  M:    Tony Lindgren <tony@atomide.com>
@@@ -10429,7 -10285,7 +10430,7 @@@ F:   drivers/regulator/tps65218-regulator
  F:    drivers/regulator/tps65910-regulator.c
  F:    drivers/regulator/twl-regulator.c
  F:    drivers/regulator/twl6030-regulator.c
 -F:    include/linux/i2c-omap.h
 +F:    include/linux/platform_data/i2c-omap.h
  
  ONION OMEGA2+ BOARD
  M:    Harvey Hunt <harveyhuntnexus@gmail.com>
@@@ -10506,7 -10362,6 +10507,7 @@@ T:   git git://linuxtv.org/media_tree.gi
  S:    Odd fixes
  F:    drivers/media/i2c/ov772x.c
  F:    include/media/i2c/ov772x.h
 +F:    Documentation/devicetree/bindings/media/i2c/ov772x.txt
  
  OMNIVISION OV7740 SENSOR DRIVER
  M:    Wenyou Yang <wenyou.yang@microchip.com>
@@@ -10557,14 -10412,12 +10558,14 @@@ F:        drivers/infiniband/ulp/opa_vni
  
  OPEN FIRMWARE AND DEVICE TREE OVERLAYS
  M:    Pantelis Antoniou <pantelis.antoniou@konsulko.com>
 +M:    Frank Rowand <frowand.list@gmail.com>
  L:    devicetree@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/dynamic-resolution-notes.txt
  F:    Documentation/devicetree/overlay-notes.txt
  F:    drivers/of/overlay.c
  F:    drivers/of/resolver.c
 +K:    of_overlay_notifier_
  
  OPEN FIRMWARE AND FLATTENED DEVICE TREE
  M:    Rob Herring <robh+dt@kernel.org>
@@@ -10733,7 -10586,7 +10734,7 @@@ PARALLEL LCD/KEYPAD PANEL DRIVE
  M:    Willy Tarreau <willy@haproxy.com>
  M:    Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
  S:    Odd Fixes
 -F:    Documentation/misc-devices/lcd-panel-cgram.txt
 +F:    Documentation/auxdisplay/lcd-panel-cgram.txt
  F:    drivers/misc/panel.c
  
  PARALLEL PORT SUBSYSTEM
@@@ -10834,7 -10687,7 +10835,7 @@@ L:   linux-pci@vger.kernel.or
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/aardvark-pci.txt
 -F:    drivers/pci/host/pci-aardvark.c
 +F:    drivers/pci/controller/pci-aardvark.c
  
  PCI DRIVER FOR ALTERA PCIE IP
  M:    Ley Foon Tan <lftan@altera.com>
@@@ -10842,7 -10695,7 +10843,7 @@@ L:   rfi@lists.rocketboards.org (moderate
  L:    linux-pci@vger.kernel.org
  S:    Supported
  F:    Documentation/devicetree/bindings/pci/altera-pcie.txt
 -F:    drivers/pci/host/pcie-altera.c
 +F:    drivers/pci/controller/pcie-altera.c
  
  PCI DRIVER FOR APPLIEDMICRO XGENE
  M:    Tanmay Inamdar <tinamdar@apm.com>
@@@ -10850,7 -10703,7 +10851,7 @@@ L:   linux-pci@vger.kernel.or
  L:    linux-arm-kernel@lists.infradead.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/xgene-pci.txt
 -F:    drivers/pci/host/pci-xgene.c
 +F:    drivers/pci/controller/pci-xgene.c
  
  PCI DRIVER FOR ARM VERSATILE PLATFORM
  M:    Rob Herring <robh@kernel.org>
@@@ -10858,7 -10711,7 +10859,7 @@@ L:   linux-pci@vger.kernel.or
  L:    linux-arm-kernel@lists.infradead.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/versatile.txt
 -F:    drivers/pci/host/pci-versatile.c
 +F:    drivers/pci/controller/pci-versatile.c
  
  PCI DRIVER FOR ARMADA 8K
  M:    Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
@@@ -10866,24 -10719,24 +10867,24 @@@ L:        linux-pci@vger.kernel.or
  L:    linux-arm-kernel@lists.infradead.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/pci-armada8k.txt
 -F:    drivers/pci/dwc/pcie-armada8k.c
 +F:    drivers/pci/controller/dwc/pcie-armada8k.c
  
  PCI DRIVER FOR CADENCE PCIE IP
  M:    Alan Douglas <adouglas@cadence.com>
  L:    linux-pci@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/cdns,*.txt
 -F:    drivers/pci/cadence/pcie-cadence*
 +F:    drivers/pci/controller/pcie-cadence*
  
  PCI DRIVER FOR FREESCALE LAYERSCAPE
 -M:    Minghuan Lian <minghuan.Lian@freescale.com>
 -M:    Mingkai Hu <mingkai.hu@freescale.com>
 -M:    Roy Zang <tie-fei.zang@freescale.com>
 +M:    Minghuan Lian <minghuan.Lian@nxp.com>
 +M:    Mingkai Hu <mingkai.hu@nxp.com>
 +M:    Roy Zang <roy.zang@nxp.com>
  L:    linuxppc-dev@lists.ozlabs.org
  L:    linux-pci@vger.kernel.org
  L:    linux-arm-kernel@lists.infradead.org
  S:    Maintained
 -F:    drivers/pci/dwc/*layerscape*
 +F:    drivers/pci/controller/dwc/*layerscape*
  
  PCI DRIVER FOR GENERIC OF HOSTS
  M:    Will Deacon <will.deacon@arm.com>
@@@ -10891,8 -10744,8 +10892,8 @@@ L:   linux-pci@vger.kernel.or
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/host-generic-pci.txt
 -F:    drivers/pci/host/pci-host-common.c
 -F:    drivers/pci/host/pci-host-generic.c
 +F:    drivers/pci/controller/pci-host-common.c
 +F:    drivers/pci/controller/pci-host-generic.c
  
  PCI DRIVER FOR IMX6
  M:    Richard Zhu <hongxing.zhu@nxp.com>
@@@ -10901,14 -10754,14 +10902,14 @@@ L:        linux-pci@vger.kernel.or
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
 -F:    drivers/pci/dwc/*imx6*
 +F:    drivers/pci/controller/dwc/*imx6*
  
  PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD)
  M:    Keith Busch <keith.busch@intel.com>
  M:    Jonathan Derrick <jonathan.derrick@intel.com>
  L:    linux-pci@vger.kernel.org
  S:    Supported
 -F:    drivers/pci/host/vmd.c
 +F:    drivers/pci/controller/vmd.c
  
  PCI DRIVER FOR MICROSEMI SWITCHTEC
  M:    Kurt Schwemmer <kurt.schwemmer@microsemi.com>
@@@ -10928,7 -10781,7 +10929,7 @@@ M:   Jason Cooper <jason@lakedaemon.net
  L:    linux-pci@vger.kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -F:    drivers/pci/host/*mvebu*
 +F:    drivers/pci/controller/*mvebu*
  
  PCI DRIVER FOR NVIDIA TEGRA
  M:    Thierry Reding <thierry.reding@gmail.com>
@@@ -10936,14 -10789,14 +10937,14 @@@ L:        linux-tegra@vger.kernel.or
  L:    linux-pci@vger.kernel.org
  S:    Supported
  F:    Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt
 -F:    drivers/pci/host/pci-tegra.c
 +F:    drivers/pci/controller/pci-tegra.c
  
  PCI DRIVER FOR RENESAS R-CAR
  M:    Simon Horman <horms@verge.net.au>
  L:    linux-pci@vger.kernel.org
  L:    linux-renesas-soc@vger.kernel.org
  S:    Maintained
 -F:    drivers/pci/host/*rcar*
 +F:    drivers/pci/controller/*rcar*
  
  PCI DRIVER FOR SAMSUNG EXYNOS
  M:    Jingoo Han <jingoohan1@gmail.com>
@@@ -10951,7 -10804,7 +10952,7 @@@ L:   linux-pci@vger.kernel.or
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
  S:    Maintained
 -F:    drivers/pci/dwc/pci-exynos.c
 +F:    drivers/pci/controller/dwc/pci-exynos.c
  
  PCI DRIVER FOR SYNOPSYS DESIGNWARE
  M:    Jingoo Han <jingoohan1@gmail.com>
@@@ -10959,7 -10812,7 +10960,7 @@@ M:   Joao Pinto <Joao.Pinto@synopsys.com
  L:    linux-pci@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/designware-pcie.txt
 -F:    drivers/pci/dwc/*designware*
 +F:    drivers/pci/controller/dwc/*designware*
  
  PCI DRIVER FOR TI DRA7XX
  M:    Kishon Vijay Abraham I <kishon@ti.com>
@@@ -10967,14 -10820,14 +10968,14 @@@ L:        linux-omap@vger.kernel.or
  L:    linux-pci@vger.kernel.org
  S:    Supported
  F:    Documentation/devicetree/bindings/pci/ti-pci.txt
 -F:    drivers/pci/dwc/pci-dra7xx.c
 +F:    drivers/pci/controller/dwc/pci-dra7xx.c
  
  PCI DRIVER FOR TI KEYSTONE
  M:    Murali Karicheri <m-karicheri2@ti.com>
  L:    linux-pci@vger.kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -F:    drivers/pci/dwc/*keystone*
 +F:    drivers/pci/controller/dwc/*keystone*
  
  PCI ENDPOINT SUBSYSTEM
  M:    Kishon Vijay Abraham I <kishon@ti.com>
@@@ -11007,7 -10860,7 +11008,7 @@@ L:   rfi@lists.rocketboards.org (moderate
  L:    linux-pci@vger.kernel.org
  S:    Supported
  F:    Documentation/devicetree/bindings/pci/altera-pcie-msi.txt
 -F:    drivers/pci/host/pcie-altera-msi.c
 +F:    drivers/pci/controller/pcie-altera-msi.c
  
  PCI MSI DRIVER FOR APPLIEDMICRO XGENE
  M:    Duc Dang <dhdang@apm.com>
@@@ -11015,7 -10868,7 +11016,7 @@@ L:   linux-pci@vger.kernel.or
  L:    linux-arm-kernel@lists.infradead.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/xgene-pci-msi.txt
 -F:    drivers/pci/host/pci-xgene-msi.c
 +F:    drivers/pci/controller/pci-xgene-msi.c
  
  PCI SUBSYSTEM
  M:    Bjorn Helgaas <bhelgaas@google.com>
@@@ -11041,7 -10894,9 +11042,7 @@@ L:   linux-pci@vger.kernel.or
  Q:    http://patchwork.ozlabs.org/project/linux-pci/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/
  S:    Supported
 -F:    drivers/pci/cadence/
 -F:    drivers/pci/host/
 -F:    drivers/pci/dwc/
 +F:    drivers/pci/controller/
  
  PCIE DRIVER FOR AXIS ARTPEC
  M:    Jesper Nilsson <jesper.nilsson@axis.com>
@@@ -11049,7 -10904,7 +11050,7 @@@ L:   linux-arm-kernel@axis.co
  L:    linux-pci@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/axis,artpec*
 -F:    drivers/pci/dwc/*artpec*
 +F:    drivers/pci/controller/dwc/*artpec*
  
  PCIE DRIVER FOR CAVIUM THUNDERX
  M:    David Daney <david.daney@cavium.com>
@@@ -11057,22 -10912,22 +11058,22 @@@ L:        linux-pci@vger.kernel.or
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  F:    Documentation/devicetree/bindings/pci/pci-thunder-*
 -F:    drivers/pci/host/pci-thunder-*
 +F:    drivers/pci/controller/pci-thunder-*
  
  PCIE DRIVER FOR HISILICON
  M:    Zhou Wang <wangzhou1@hisilicon.com>
  L:    linux-pci@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
 -F:    drivers/pci/dwc/pcie-hisi.c
 +F:    drivers/pci/controller/dwc/pcie-hisi.c
  
  PCIE DRIVER FOR HISILICON KIRIN
  M:    Xiaowei Song <songxiaowei@hisilicon.com>
  M:    Binghui Wang <wangbinghui@hisilicon.com>
  L:    linux-pci@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/pci/pcie-kirin.txt
 -F:    drivers/pci/dwc/pcie-kirin.c
 +F:    Documentation/devicetree/bindings/pci/kirin-pcie.txt
 +F:    drivers/pci/controller/dwc/pcie-kirin.c
  
  PCIE DRIVER FOR HISILICON STB
  M:    Jianguo Sun <sunjianguo1@huawei.com>
@@@ -11080,7 -10935,7 +11081,7 @@@ M:   Shawn Guo <shawn.guo@linaro.org
  L:    linux-pci@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/hisilicon-histb-pcie.txt
 -F:    drivers/pci/dwc/pcie-histb.c
 +F:    drivers/pci/controller/dwc/pcie-histb.c
  
  PCIE DRIVER FOR MEDIATEK
  M:    Ryder Lee <ryder.lee@mediatek.com>
@@@ -11088,35 -10943,35 +11089,35 @@@ L:        linux-pci@vger.kernel.or
  L:    linux-mediatek@lists.infradead.org
  S:    Supported
  F:    Documentation/devicetree/bindings/pci/mediatek*
 -F:    drivers/pci/host/*mediatek*
 +F:    drivers/pci/controller/*mediatek*
  
  PCIE DRIVER FOR QUALCOMM MSM
  M:    Stanimir Varbanov <svarbanov@mm-sol.com>
  L:    linux-pci@vger.kernel.org
  L:    linux-arm-msm@vger.kernel.org
  S:    Maintained
 -F:    drivers/pci/dwc/*qcom*
 +F:    drivers/pci/controller/dwc/*qcom*
  
  PCIE DRIVER FOR ROCKCHIP
  M:    Shawn Lin <shawn.lin@rock-chips.com>
  L:    linux-pci@vger.kernel.org
  L:    linux-rockchip@lists.infradead.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/pci/rockchip-pcie.txt
 -F:    drivers/pci/host/pcie-rockchip.c
 +F:    Documentation/devicetree/bindings/pci/rockchip-pcie*
 +F:    drivers/pci/controller/pcie-rockchip*
  
  PCI DRIVER FOR V3 SEMICONDUCTOR V360EPC
  M:    Linus Walleij <linus.walleij@linaro.org>
  L:    linux-pci@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/v3-v360epc-pci.txt
 -F:    drivers/pci/host/pci-v3-semi.c
 +F:    drivers/pci/controller/pci-v3-semi.c
  
  PCIE DRIVER FOR ST SPEAR13XX
  M:    Pratyush Anand <pratyush.anand@gmail.com>
  L:    linux-pci@vger.kernel.org
  S:    Maintained
 -F:    drivers/pci/dwc/*spear*
 +F:    drivers/pci/controller/dwc/*spear*
  
  PCMCIA SUBSYSTEM
  M:    Dominik Brodowski <linux@dominikbrodowski.net>
@@@ -11266,7 -11121,6 +11267,7 @@@ L:   linux-mediatek@lists.infradead.org (
  S:    Maintained
  F:    Documentation/devicetree/bindings/pinctrl/pinctrl-mt65xx.txt
  F:    Documentation/devicetree/bindings/pinctrl/pinctrl-mt7622.txt
 +F:    drivers/pinctrl/mediatek/mtk-eint.*
  F:    drivers/pinctrl/mediatek/pinctrl-mtk-common.*
  F:    drivers/pinctrl/mediatek/pinctrl-mt2701.c
  F:    drivers/pinctrl/mediatek/pinctrl-mt7622.c
@@@ -11405,7 -11259,6 +11406,7 @@@ M:   Sebastian Reichel <sre@kernel.org
  L:    linux-pm@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git
  S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-class-power
  F:    Documentation/devicetree/bindings/power/supply/
  F:    include/linux/power_supply.h
  F:    drivers/power/supply/
@@@ -11483,15 -11336,6 +11484,15 @@@ W: http://wireless.kernel.org/en/users/
  S:    Obsolete
  F:    drivers/net/wireless/intersil/prism54/
  
 +PROC FILESYSTEM
 +R:    Alexey Dobriyan <adobriyan@gmail.com>
 +L:    linux-kernel@vger.kernel.org
 +L:    linux-fsdevel@vger.kernel.org
 +S:    Maintained
 +F:    fs/proc/
 +F:    include/linux/proc_fs.h
 +F:    tools/testing/selftests/proc/
 +
  PROC SYSCTL
  M:    "Luis R. Rodriguez" <mcgrof@kernel.org>
  M:    Kees Cook <keescook@chromium.org>
@@@ -11560,6 -11404,7 +11561,6 @@@ S:   Maintaine
  W:    http://linuxptp.sourceforge.net/
  F:    Documentation/ABI/testing/sysfs-ptp
  F:    Documentation/ptp/*
 -F:    drivers/net/ethernet/freescale/gianfar_ptp.c
  F:    drivers/net/phy/dp83640*
  F:    drivers/ptp/*
  F:    include/linux/ptp_cl*
@@@ -11794,7 -11639,7 +11795,7 @@@ S:   Maintaine
  F:    drivers/media/tuners/qt1010*
  
  QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
 -M:    Kalle Valo <kvalo@qca.qualcomm.com>
 +M:    Kalle Valo <kvalo@codeaurora.org>
  L:    ath10k@lists.infradead.org
  W:    http://wireless.kernel.org/en/users/Drivers/ath10k
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
@@@ -11816,17 -11661,10 +11817,17 @@@ F:        Documentation/devicetree/bindings/me
  F:    Documentation/media/v4l-drivers/qcom_camss.rst
  F:    drivers/media/platform/qcom/camss-8x16/
  
 +QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
 +M:  Ilia Lin <ilia.lin@gmail.com>
 +L:  linux-pm@vger.kernel.org
 +S:  Maintained
 +F:  Documentation/devicetree/bindings/opp/kryo-cpufreq.txt
 +F:  drivers/cpufreq/qcom-cpufreq-kryo.c
 +
  QUALCOMM EMAC GIGABIT ETHERNET DRIVER
 -M:    Timur Tabi <timur@codeaurora.org>
 +M:    Timur Tabi <timur@kernel.org>
  L:    netdev@vger.kernel.org
 -S:    Supported
 +S:    Maintained
  F:    drivers/net/ethernet/qualcomm/emac/
  
  QUALCOMM HEXAGON ARCHITECTURE
@@@ -11836,14 -11674,6 +11837,14 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    arch/hexagon/
  
 +QUALCOMM HIDMA DRIVER
 +M:    Sinan Kaya <okaya@kernel.org>
 +L:    linux-arm-kernel@lists.infradead.org
 +L:    linux-arm-msm@vger.kernel.org
 +L:    dmaengine@vger.kernel.org
 +S:    Supported
 +F:    drivers/dma/qcom/hidma*
 +
  QUALCOMM IOMMU
  M:    Rob Clark <robdclark@gmail.com>
  L:    iommu@lists.linux-foundation.org
@@@ -11860,7 -11690,7 +11861,7 @@@ S:   Maintaine
  F:    drivers/media/platform/qcom/venus/
  
  QUALCOMM WCN36XX WIRELESS DRIVER
 -M:    Eugene Krasnikov <k.eugene.e@gmail.com>
 +M:    Kalle Valo <kvalo@codeaurora.org>
  L:    wcn36xx@lists.infradead.org
  W:    http://wireless.kernel.org/en/users/Drivers/wcn36xx
  T:    git git://github.com/KrasnikovEugene/wcn36xx.git
@@@ -12055,7 -11885,7 +12056,7 @@@ F:   include/linux/rtc.
  F:    include/uapi/linux/rtc.h
  F:    include/linux/rtc/
  F:    include/linux/platform_data/rtc-*
 -F:    tools/testing/selftests/timers/rtctest.c
 +F:    tools/testing/selftests/rtc/
  
  REALTEK AUDIO CODECS
  M:    Bard Liao <bardliao@realtek.com>
@@@ -12149,18 -11979,6 +12150,18 @@@ F: include/dt-bindings/reset
  F:    include/linux/reset.h
  F:    include/linux/reset-controller.h
  
 +RESTARTABLE SEQUENCES SUPPORT
 +M:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
 +M:    Peter Zijlstra <peterz@infradead.org>
 +M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 +M:    Boqun Feng <boqun.feng@gmail.com>
 +L:    linux-kernel@vger.kernel.org
 +S:    Supported
 +F:    kernel/rseq.c
 +F:    include/uapi/linux/rseq.h
 +F:    include/trace/events/rseq.h
 +F:    tools/testing/selftests/rseq/
 +
  RFKILL
  M:    Johannes Berg <johannes@sipsolutions.net>
  L:    linux-wireless@vger.kernel.org
@@@ -12193,7 -12011,7 +12194,7 @@@ F:   drivers/mtd/nand/raw/r852.
  
  RISC-V ARCHITECTURE
  M:    Palmer Dabbelt <palmer@sifive.com>
 -M:    Albert Ou <albert@sifive.com>
 +M:    Albert Ou <aou@eecs.berkeley.edu>
  L:    linux-riscv@lists.infradead.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux.git
  S:    Supported
@@@ -12471,7 -12289,7 +12472,7 @@@ L:   linux-crypto@vger.kernel.or
  L:    linux-samsung-soc@vger.kernel.org
  S:    Maintained
  F:    drivers/crypto/exynos-rng.c
 -F:    Documentation/devicetree/bindings/crypto/samsung,exynos-rng4.txt
 +F:    Documentation/devicetree/bindings/rng/samsung,exynos4-rng.txt
  
  SAMSUNG EXYNOS TRUE RANDOM NUMBER GENERATOR (TRNG) DRIVER
  M:    Łukasz Stelmach <l.stelmach@samsung.com>
@@@ -12953,14 -12771,6 +12954,14 @@@ F: drivers/media/usb/siano
  F:    drivers/media/usb/siano/
  F:    drivers/media/mmc/siano/
  
 +SIFIVE DRIVERS
 +M:    Palmer Dabbelt <palmer@sifive.com>
 +L:    linux-riscv@lists.infradead.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux.git
 +S:    Supported
 +K:    sifive
 +N:    sifive
 +
  SILEAD TOUCHSCREEN DRIVER
  M:    Hans de Goede <hdegoede@redhat.com>
  L:    linux-input@vger.kernel.org
@@@ -13258,13 -13068,6 +13259,13 @@@ S: Maintaine
  F:    drivers/ssb/
  F:    include/linux/ssb/
  
 +SONY IMX258 SENSOR DRIVER
 +M:    Sakari Ailus <sakari.ailus@linux.intel.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/imx258.c
 +
  SONY IMX274 SENSOR DRIVER
  M:    Leon Luo <leonl@leopardimaging.com>
  L:    linux-media@vger.kernel.org
@@@ -13309,11 -13112,11 +13310,11 @@@ F:        include/uapi/sound
  F:    sound/
  
  SOUND - COMPRESSED AUDIO
 -M:    Vinod Koul <vinod.koul@intel.com>
 +M:    Vinod Koul <vkoul@kernel.org>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  S:    Supported
 -F:    Documentation/sound/alsa/compress_offload.txt
 +F:    Documentation/sound/designs/compress-offload.rst
  F:    include/sound/compress_driver.h
  F:    include/uapi/sound/compress_*
  F:    sound/core/compress_offload.c
@@@ -13334,7 -13137,7 +13335,7 @@@ L:   alsa-devel@alsa-project.org (moderat
  W:    http://alsa-project.org/main/index.php/ASoC
  S:    Supported
  F:    Documentation/devicetree/bindings/sound/
 -F:    Documentation/sound/alsa/soc/
 +F:    Documentation/sound/soc/
  F:    sound/soc/
  F:    include/sound/soc*
  
@@@ -13481,6 -13284,13 +13482,6 @@@ 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>
@@@ -13499,6 -13309,15 +13500,6 @@@ S:  Odd Fixe
  F:    Documentation/devicetree/bindings/staging/iio/
  F:    drivers/staging/iio/
  
 -STAGING - LUSTRE PARALLEL FILESYSTEM
 -M:    Oleg Drokin <oleg.drokin@intel.com>
 -M:    Andreas Dilger <andreas.dilger@intel.com>
 -M:    James Simmons <jsimmons@infradead.org>
 -L:    lustre-devel@lists.lustre.org (moderated for non-subscribers)
 -W:    http://wiki.lustre.org/
 -S:    Maintained
 -F:    drivers/staging/lustre
 -
  STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec)
  M:    Marc Dietrich <marvin24@gmx.de>
  L:    ac100@lists.launchpad.net (moderated for non-subscribers)
@@@ -13586,20 -13405,9 +13587,20 @@@ T: git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/usb/stk1160/
  
 +STM32 TIMER/LPTIMER DRIVERS
 +M:    Fabrice Gasnier <fabrice.gasnier@st.com>
 +S:    Maintained
 +F:    drivers/*/stm32-*timer*
 +F:    drivers/pwm/pwm-stm32*
 +F:    include/linux/*/stm32-*tim*
 +F:    Documentation/ABI/testing/*timer-stm32
 +F:    Documentation/devicetree/bindings/*/stm32-*timer*
 +F:    Documentation/devicetree/bindings/pwm/pwm-stm32*
 +
  STMMAC ETHERNET DRIVER
  M:    Giuseppe Cavallaro <peppe.cavallaro@st.com>
  M:    Alexandre Torgue <alexandre.torgue@st.com>
 +M:    Jose Abreu <joabreu@synopsys.com>
  L:    netdev@vger.kernel.org
  W:    http://www.stlinux.com
  S:    Supported
@@@ -13664,7 -13472,7 +13665,7 @@@ M:   Konrad Rzeszutek Wilk <konrad.wilk@o
  L:    iommu@lists.linux-foundation.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git
  S:    Supported
 -F:    lib/swiotlb.c
 +F:    kernel/dma/swiotlb.c
  F:    arch/*/kernel/pci-swiotlb.c
  F:    include/linux/swiotlb.h
  
@@@ -13676,12 -13484,6 +13677,12 @@@ S: Supporte
  F:    net/switchdev/
  F:    include/net/switchdev.h
  
 +SY8106A REGULATOR DRIVER
 +M:    Icenowy Zheng <icenowy@aosc.io>
 +S:    Maintained
 +F:    drivers/regulator/sy8106a-regulator.c
 +F:    Documentation/devicetree/bindings/regulator/sy8106a-regulator.txt
 +
  SYNC FILE FRAMEWORK
  M:    Sumit Semwal <sumit.semwal@linaro.org>
  R:    Gustavo Padovan <gustavo@padovan.org>
@@@ -13816,7 -13618,7 +13817,7 @@@ SYSTEM TRACE MODULE CLAS
  M:    Alexander Shishkin <alexander.shishkin@linux.intel.com>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ash/stm.git
 -F:    Documentation/trace/stm.txt
 +F:    Documentation/trace/stm.rst
  F:    drivers/hwtracing/stm/
  F:    include/linux/stm.h
  F:    include/uapi/linux/stm.h
@@@ -14493,7 -14295,7 +14494,7 @@@ M:   Steven Rostedt <rostedt@goodmis.org
  M:    Ingo Molnar <mingo@redhat.com>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
  S:    Maintained
 -F:    Documentation/trace/ftrace.txt
 +F:    Documentation/trace/ftrace.rst
  F:    arch/*/*/*/ftrace.h
  F:    arch/*/kernel/ftrace.c
  F:    include/*/ftrace.h
@@@ -14576,15 -14378,6 +14577,15 @@@ S: Maintaine
  F:    drivers/tc/
  F:    include/linux/tc.h
  
 +TURBOSTAT UTILITY
 +M:    "Len Brown" <lenb@kernel.org>
 +L:    linux-pm@vger.kernel.org
 +B:    https://bugzilla.kernel.org
 +Q:    https://patchwork.kernel.org/project/linux-pm/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat
 +S:    Supported
 +F:    tools/power/x86/turbostat/
 +
  TW5864 VIDEO4LINUX DRIVER
  M:    Bluecherry Maintainers <maintainers@bluecherrydvr.com>
  M:    Anton Sviridenko <anton@corp.bluecherry.net>
@@@ -14831,9 -14624,7 +14832,9 @@@ M:   Woojung Huh <woojung.huh@microchip.c
  M:    Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
 +F:    Documentation/devicetree/bindings/net/microchip,lan78xx.txt
  F:    drivers/net/usb/lan78xx.*
 +F:    include/dt-bindings/net/microchip-lan78xx.h
  
  USB MASS STORAGE DRIVER
  M:    Alan Stern <stern@rowland.harvard.edu>
@@@ -14877,7 -14668,6 +14878,7 @@@ S:   Maintaine
  F:    Documentation/usb/usbip_protocol.txt
  F:    drivers/usb/usbip/
  F:    tools/usb/usbip/
 +F:    tools/testing/selftests/drivers/usb/usbip/
  
  USB PEGASUS DRIVER
  M:    Petko Manolov <petkan@nucleusys.com>
@@@ -14962,7 -14752,7 +14963,7 @@@ M:   Heikki Krogerus <heikki.krogerus@lin
  L:    linux-usb@vger.kernel.org
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-class-typec
 -F:    Documentation/usb/typec.rst
 +F:    Documentation/driver-api/usb/typec.rst
  F:    drivers/usb/typec/
  F:    include/linux/usb/typec.h
  
@@@ -15029,7 -14819,8 +15030,7 @@@ F:   drivers/media/usb/zr364xx
  USER-MODE LINUX (UML)
  M:    Jeff Dike <jdike@addtoit.com>
  M:    Richard Weinberger <richard@nod.at>
 -L:    user-mode-linux-devel@lists.sourceforge.net
 -L:    user-mode-linux-user@lists.sourceforge.net
 +L:    linux-um@lists.infradead.org
  W:    http://user-mode-linux.sourceforge.net
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git
  S:    Maintained
@@@ -15149,12 -14940,6 +15150,12 @@@ L: linux-media@vger.kernel.or
  S:    Maintained
  F:    drivers/media/platform/video-mux.c
  
 +VIDEO I2C POLLING DRIVER
 +M:    Matt Ranostay <matt.ranostay@konsulko.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/i2c/video-i2c.c
 +
  VIDEOBUF2 FRAMEWORK
  M:    Pawel Osciak <pawel@osciak.com>
  M:    Marek Szyprowski <m.szyprowski@samsung.com>
@@@ -15588,17 -15373,9 +15589,17 @@@ M: x86@kernel.or
  L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
  S:    Maintained
 +F:    Documentation/devicetree/bindings/x86/
  F:    Documentation/x86/
  F:    arch/x86/
  
 +X86 ENTRY CODE
 +M:    Andy Lutomirski <luto@kernel.org>
 +L:    linux-kernel@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/asm
 +S:    Maintained
 +F:    arch/x86/entry/
 +
  X86 MCE INFRASTRUCTURE
  M:    Tony Luck <tony.luck@intel.com>
  M:    Borislav Petkov <bp@alien8.de>
@@@ -15621,7 -15398,7 +15622,7 @@@ F:   drivers/platform/x86
  F:    drivers/platform/olpc/
  
  X86 VDSO
 -M:    Andy Lutomirski <luto@amacapital.net>
 +M:    Andy Lutomirski <luto@kernel.org>
  L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/vdso
  S:    Maintained
@@@ -15635,14 -15412,6 +15636,14 @@@ T: git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/tuners/tuner-xc2028.*
  
 +XDP SOCKETS (AF_XDP)
 +M:    Björn Töpel <bjorn.topel@intel.com>
 +M:    Magnus Karlsson <magnus.karlsson@intel.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    kernel/bpf/xskmap.c
 +F:    net/xdp/
 +
  XEN BLOCK SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  M:    Roger Pau Monné <roger.pau@citrix.com>
@@@ -15713,13 -15482,6 +15714,13 @@@ S: Supporte
  F:    arch/x86/xen/*swiotlb*
  F:    drivers/xen/*swiotlb*
  
 +XEN SOUND FRONTEND DRIVER
 +M:    Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
 +L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +S:    Supported
 +F:    sound/xen/*
 +
  XFS FILESYSTEM
  M:    Darrick J. Wong <darrick.wong@oracle.com>
  M:    linux-xfs@vger.kernel.org
@@@ -15758,14 -15520,6 +15759,14 @@@ L: linux-kernel@vger.kernel.or
  S:    Supported
  F:    drivers/char/xillybus/
  
 +XLP9XX I2C DRIVER
 +M:    George Cherian <george.cherian@cavium.com>
 +M:    Jan Glauber <jglauber@cavium.com>
 +L:    linux-i2c@vger.kernel.org
 +W:    http://www.cavium.com
 +S:    Supported
 +F:    drivers/i2c/busses/i2c-xlp9xx.c
 +
  XRA1403 GPIO EXPANDER
  M:    Nandor Han <nandor.han@ge.com>
  M:    Semi Malinen <semi.malinen@ge.com>
@@@ -15799,7 -15553,7 +15800,7 @@@ YEALINK PHONE DRIVE
  M:    Henk Vergonet <Henk.Vergonet@gmail.com>
  L:    usbb2k-api-dev@nongnu.org
  S:    Maintained
 -F:    Documentation/input/yealink.rst
 +F:    Documentation/input/devices/yealink.rst
  F:    drivers/input/misc/yealink.*
  
  Z8530 DRIVER FOR AX.25
@@@ -15860,7 -15614,7 +15861,7 @@@ L:   linux-media@vger.kernel.or
  W:    http://mjpeg.sourceforge.net/driver-zoran/
  T:    hg https://linuxtv.org/hg/v4l-dvb
  S:    Odd Fixes
 -F:    drivers/media/pci/zoran/
 +F:    drivers/staging/media/zoran/
  
  ZRAM COMPRESSED RAM BLOCK DEVICE DRVIER
  M:    Minchan Kim <minchan@kernel.org>
@@@ -15884,7 -15638,7 +15885,7 @@@ L:   linux-mm@kvack.or
  S:    Maintained
  F:    mm/zsmalloc.c
  F:    include/linux/zsmalloc.h
 -F:    Documentation/vm/zsmalloc.txt
 +F:    Documentation/vm/zsmalloc.rst
  
  ZSWAP COMPRESSED SWAP CACHING
  M:    Seth Jennings <sjenning@redhat.com>