Merge drm/drm-next into drm-misc-next

Finally have a reason for a backmerge other than "it's been a while"!

Backmerging drm-next to -misc-next to facilitate Rob Herring's work on
Panfrost.

Signed-off-by: Sean Paul <[email protected]>

diff --combined MAINTAINERS
index afa7c6f17241be807a7fab8294cf62f7925659e8,4b69b6b48b3b4a77803646758fa55c8f208bdd98..8825dffebb4c5aef35ad8d7dc23277a324ee1caa
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -331,6 -331,7 +331,7 @@@ ACPI APE
  M:    "Rafael J. Wysocki" <[email protected]>
  M:    Len Brown <[email protected]>
  L:    [email protected]
+ R:    James Morse <[email protected]>
  R:    Tony Luck <[email protected]>
  R:    Borislav Petkov <[email protected]>
  F:    drivers/acpi/apei/
@@@ -365,6 -366,7 +366,7 @@@ M: Lorenzo Pieralisi <lorenzo.pieralisi
  M:    Hanjun Guo <[email protected]>
  M:    Sudeep Holla <[email protected]>
  L:    [email protected]
+ L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/acpi/arm64
  
@@@ -765,6 -767,13 +767,13 @@@ S:       Supporte
  F:    Documentation/hwmon/fam15h_power
  F:    drivers/hwmon/fam15h_power.c
  
+ AMD FCH GPIO DRIVER
+ M:    Enrico Weigelt, metux IT consult <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/gpio/gpio-amd-fch.c
+ F:    include/linux/platform_data/gpio/gpio-amd-fch.h
+ 
  AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
  L:    [email protected] (moderated for non-subscribers)
  S:    Orphan
@@@ -853,6 -862,22 +862,22 @@@ S:       Supporte
  F:    drivers/iio/adc/ad7124.c
  F:    Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt
  
+ ANALOG DEVICES INC AD7606 DRIVER
+ M:    Stefan Popa <[email protected]>
+ L:    [email protected]
+ W:    http://ez.analog.com/community/linux-device-drivers
+ S:    Supported
+ F:    drivers/iio/adc/ad7606.c
+ F:    Documentation/devicetree/bindings/iio/adc/ad7606.txt
+ 
+ ANALOG DEVICES INC AD7768-1 DRIVER
+ M:    Stefan Popa <[email protected]>
+ L:    [email protected]
+ W:    http://ez.analog.com/community/linux-device-drivers
+ S:    Supported
+ F:    drivers/iio/adc/ad7768-1.c
+ F:    Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.txt
+ 
  ANALOG DEVICES INC AD9389B DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
@@@ -1034,28 -1059,30 +1059,30 @@@ L:   [email protected]
  S:    Odd fixes
  F:    drivers/net/appletalk/
  F:    net/appletalk/
+ F:    include/linux/atalk.h
+ F:    include/uapi/linux/atalk.h
  
  APPLIED MICRO (APM) X-GENE DEVICE TREE SUPPORT
- M:    Duc Dang <dhdang@apm.com>
+ M:    Khuong Dinh <[email protected].com>
  S:    Supported
  F:    arch/arm64/boot/dts/apm/
  
  APPLIED MICRO (APM) X-GENE SOC EDAC
- M:    Loc Ho <lho@apm.com>
+ M:    Khuong Dinh <[email protected].com>
  S:    Supported
  F:    drivers/edac/xgene_edac.c
  F:    Documentation/devicetree/bindings/edac/apm-xgene-edac.txt
  
  APPLIED MICRO (APM) X-GENE SOC ETHERNET (V2) DRIVER
- M:    Iyappan Subramanian <isubramanian@apm.com>
- M:    Keyur Chudgar <kchudgar@apm.com>
+ M:    Iyappan Subramanian <i[email protected].com>
+ M:    Keyur Chudgar <k[email protected].com>
  S:    Supported
  F:    drivers/net/ethernet/apm/xgene-v2/
  
  APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER
- M:    Iyappan Subramanian <isubramanian@apm.com>
- M:    Keyur Chudgar <kchudgar@apm.com>
- M:    Quan Nguyen <qnguyen@apm.com>
+ M:    Iyappan Subramanian <i[email protected].com>
+ M:    Keyur Chudgar <k[email protected].com>
+ M:    Quan Nguyen <q[email protected].com>
  S:    Supported
  F:    drivers/net/ethernet/apm/xgene/
  F:    drivers/net/phy/mdio-xgene.c
@@@ -1063,7 -1090,7 +1090,7 @@@ F:      Documentation/devicetree/bindings/ne
  F:    Documentation/devicetree/bindings/net/apm-xgene-mdio.txt
  
  APPLIED MICRO (APM) X-GENE SOC PMU
- M:    Tai Nguyen <ttnguyen@apm.com>
+ M:    Khuong Dinh <[email protected].com>
  S:    Supported
  F:    drivers/perf/xgene_pmu.c
  F:    Documentation/perf/xgene-pmu.txt
@@@ -1140,7 -1167,7 +1167,7 @@@ S:      Supporte
  T:    git git://linux-arm.org/linux-ld.git for-upstream/mali-dp
  F:    drivers/gpu/drm/arm/display/include/
  F:    drivers/gpu/drm/arm/display/komeda/
- F:    Documentation/devicetree/bindings/display/arm/arm,komeda.txt
+ F:    Documentation/devicetree/bindings/display/arm,komeda.txt
  F:    Documentation/gpu/komeda-kms.rst
  
  ARM MALI-DP DRM DRIVER
@@@ -1171,7 -1198,7 +1198,7 @@@ F:      arch/arm*/include/asm/hw_breakpoint.
  F:    arch/arm*/include/asm/perf_event.h
  F:    drivers/perf/*
  F:    include/linux/perf/arm_pmu.h
- F:    Documentation/devicetree/bindings/arm/pmu.txt
+ F:    Documentation/devicetree/bindings/arm/pmu.yaml
  F:    Documentation/devicetree/bindings/perf/
  
  ARM PORT
@@@ -1384,6 -1411,13 +1411,13 @@@ F:    arch/arm/mach-aspeed
  F:    arch/arm/boot/dts/aspeed-*
  N:    aspeed
  
+ ARM/BITMAIN ARCHITECTURE
+ M:    Manivannan Sadhasivam <[email protected]>
+ L:    [email protected] (moderated for non-subscribers)
+ S:    Maintained
+ F:    arch/arm64/boot/dts/bitmain/
+ F:    Documentation/devicetree/bindings/arm/bitmain.yaml
+ 
  ARM/CALXEDA HIGHBANK ARCHITECTURE
  M:    Rob Herring <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1543,21 -1577,14 +1577,14 @@@ ARM/FREESCALE IMX / MXC ARM ARCHITECTUR
  M:    Shawn Guo <[email protected]>
  M:    Sascha Hauer <[email protected]>
  R:    Pengutronix Kernel Team <[email protected]>
- R:    Fabio Estevam <fabio.estevam@nxp.com>
+ R:    Fabio Estevam <festevam@gmail.com>
  R:    NXP Linux Team <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
- F:    arch/arm/mach-imx/
- F:    arch/arm/mach-mxs/
- F:    arch/arm/boot/dts/imx*
- F:    arch/arm/configs/imx*_defconfig
- F:    arch/arm64/boot/dts/freescale/imx*
- F:    drivers/clk/imx/
- F:    drivers/firmware/imx/
- F:    drivers/soc/imx/
- F:    include/linux/firmware/imx/
- F:    include/soc/imx/
+ N:    imx
+ N:    mxs
+ X:    drivers/media/i2c/
  
  ARM/FREESCALE VYBRID ARM ARCHITECTURE
  M:    Shawn Guo <[email protected]>
@@@ -1749,6 -1776,7 +1776,7 @@@ F:      arch/arm/configs/mvebu_*_defconfi
  F:    arch/arm/mach-mvebu/
  F:    arch/arm64/boot/dts/marvell/armada*
  F:    drivers/cpufreq/armada-37xx-cpufreq.c
+ F:    drivers/cpufreq/armada-8k-cpufreq.c
  F:    drivers/cpufreq/mvebu-cpufreq.c
  F:    drivers/irqchip/irq-armada-370-xp.c
  F:    drivers/irqchip/irq-mvebu-*
@@@ -1894,10 -1922,11 +1922,11 @@@ F:   drivers/usb/host/ehci-w90x900.
  F:    drivers/video/fbdev/nuc900fb.c
  
  ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
- M:    Nelson Castillo <[email protected]>
  L:    [email protected] (subscribers-only)
  W:    http://wiki.openmoko.org/wiki/Neo_FreeRunner
- S:    Supported
+ S:    Orphan
+ F:    arch/arm/mach-s3c24xx/mach-gta02.c
+ F:    arch/arm/mach-s3c24xx/gta02.h
  
  ARM/Orion SoC/Technologic Systems TS-78xx platform support
  M:    Alexander Clouter <[email protected]>
@@@ -1960,19 -1989,37 +1989,37 @@@ M:   David Brown <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/soc/qcom/
+ F:    Documentation/devicetree/bindings/*/qcom*
  F:    arch/arm/boot/dts/qcom-*.dts
  F:    arch/arm/boot/dts/qcom-*.dtsi
  F:    arch/arm/mach-qcom/
- F:    arch/arm64/boot/dts/qcom/*
+ F:    arch/arm64/boot/dts/qcom/
+ F:    drivers/*/qcom/
+ F:    drivers/*/qcom*
+ F:    drivers/*/*/qcom/
+ F:    drivers/*/*/qcom*
+ F:    drivers/*/pm8???-*
+ F:    drivers/bluetooth/btqcomsmd.c
+ F:    drivers/clocksource/timer-qcom.c
+ F:    drivers/extcon/extcon-qcom*
+ F:    drivers/iommu/msm*
  F:    drivers/i2c/busses/i2c-qup.c
- F:    drivers/clk/qcom/
- F:    drivers/dma/qcom/
- F:    drivers/soc/qcom/
+ F:    drivers/i2c/busses/i2c-qcom-geni.c
+ F:    drivers/mfd/ssbi.c
+ F:    drivers/mmc/host/mmci_qcom*
+ F:    drivers/mmc/host/sdhci_msm.c
+ F:    drivers/pci/controller/dwc/pcie-qcom.c
+ F:    drivers/phy/qualcomm/
+ F:    drivers/power/*/msm*
+ F:    drivers/reset/reset-qcom-*
+ F:    drivers/scsi/ufs/ufs-qcom.*
  F:    drivers/spi/spi-qup.c
+ F:    drivers/spi/spi-geni-qcom.c
+ F:    drivers/spi/spi-qcom-qspi.c
  F:    drivers/tty/serial/msm_serial.c
- F:    drivers/*/pm8???-*
- F:    drivers/mfd/ssbi.c
- F:    drivers/firmware/qcom_scm*
+ F:    drivers/usb/dwc3/dwc3-qcom.c
+ F:    include/dt-bindings/*/qcom*
+ F:    include/linux/*/qcom*
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git
  
  ARM/RADISYS ENP2611 MACHINE SUPPORT
@@@ -2009,7 -2056,7 +2056,7 @@@ Q:      http://patchwork.kernel.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
  S:    Supported
  F:    arch/arm64/boot/dts/renesas/
- F:    Documentation/devicetree/bindings/arm/shmobile.txt
+ F:    Documentation/devicetree/bindings/arm/renesas.yaml
  F:    drivers/soc/renesas/
  F:    include/linux/soc/renesas/
  
@@@ -2096,8 -2143,9 +2143,9 @@@ F:      drivers/media/platform/s5p-cec
  F:    Documentation/devicetree/bindings/media/s5p-cec.txt
  
  ARM/SAMSUNG S5P SERIES JPEG CODEC SUPPORT
- M:    Andrzej Pietrasiewicz <andrzej.p@samsung.com>
+ M:    Andrzej Pietrasiewicz <andrzejtp2010@gmail.com>
  M:    Jacek Anaszewski <[email protected]>
+ M:    Sylwester Nawrocki <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -2121,6 -2169,8 +2169,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/arm/boot/dts/emev2*
+ F:    arch/arm/boot/dts/gr-peach*
+ F:    arch/arm/boot/dts/iwg20d-q7*
  F:    arch/arm/boot/dts/r7s*
  F:    arch/arm/boot/dts/r8a*
  F:    arch/arm/boot/dts/r9a*
@@@ -2128,7 -2178,7 +2178,7 @@@ F:      arch/arm/boot/dts/sh
  F:    arch/arm/configs/shmobile_defconfig
  F:    arch/arm/include/debug/renesas-scif.S
  F:    arch/arm/mach-shmobile/
- F:    Documentation/devicetree/bindings/arm/shmobile.txt
+ F:    Documentation/devicetree/bindings/arm/renesas.yaml
  F:    drivers/soc/renesas/
  F:    include/linux/soc/renesas/
  
@@@ -2515,7 -2565,6 +2565,6 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    Documentation/devicetree/bindings/eeprom/at24.txt
  F:    drivers/misc/eeprom/at24.c
- F:    include/linux/platform_data/at24.h
  
  ATA OVER ETHERNET (AOE) DRIVER
  M:    "Ed L. Cashin" <[email protected]>
@@@ -2621,6 -2670,7 +2670,7 @@@ L:      [email protected]
  S:    Maintained
  F:    arch/*/include/asm/atomic*.h
  F:    include/*/atomic*.h
+ F:    scripts/atomic/
  
  ATTO EXPRESSSAS SAS/SATA RAID SCSI DRIVER
  M:    Bradley Grove <[email protected]>
@@@ -2929,6 -2979,12 +2979,12 @@@ L:    [email protected]
  S:    Maintained
  F:    arch/powerpc/net/
  
+ BPF JIT for RISC-V (RV64G)
+ M:    Björn Töpel <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    arch/riscv/net/
+ 
  BPF JIT for S390
  M:    Martin Schwidefsky <[email protected]>
  M:    Heiko Carstens <[email protected]>
@@@ -3148,6 -3204,7 +3204,7 @@@ F:      drivers/phy/broadcom/phy-brcm-usb
  BROADCOM GENET ETHERNET DRIVER
  M:    Doug Berger <[email protected]>
  M:    Florian Fainelli <[email protected]>
+ L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/broadcom/genet/
@@@ -3255,6 -3312,7 +3312,7 @@@ F:      drivers/spi/spi-iproc-qspi.
  
  BROADCOM SYSTEMPORT ETHERNET DRIVER
  M:    Florian Fainelli <[email protected]>
+ L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bcmsysport.*
@@@ -3536,7 -3594,6 +3594,6 @@@ F:      include/linux/spi/cc2520.
  F:    Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
  
  CCREE ARM TRUSTZONE CRYPTOCELL REE DRIVER
- M:    Yael Chemla <[email protected]>
  M:    Gilad Ben-Yossef <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -3700,7 -3757,7 +3757,7 @@@ CHROME HARDWARE PLATFORM SUPPOR
  M:    Benson Leung <[email protected]>
  M:    Enric Balletbo i Serra <[email protected]>
  S:    Maintained
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git
  F:    drivers/platform/chrome/
  
  CHROMEOS EC SUBDRIVERS
@@@ -3712,6 -3769,14 +3769,14 @@@ N:    cros_e
  N:    cros-ec
  F:    drivers/power/supply/cros_usbpd-charger.c
  
+ CHROMEOS EC CODEC DRIVER
+ M:    Cheng-Yi Chiang <[email protected]>
+ S:    Maintained
+ R:    Enric Balletbo i Serra <[email protected]>
+ R:    Guenter Roeck <[email protected]>
+ F:    Documentation/devicetree/bindings/sound/google,cros-ec-codec.txt
+ F:    sound/soc/codecs/cros_ec_codec.*
+ 
  CIRRUS LOGIC AUDIO CODEC DRIVERS
  M:    Brian Austin <[email protected]>
  M:    Paul Handrigan <[email protected]>
@@@ -3725,6 -3790,23 +3790,23 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/cirrus/ep93xx_eth.c
  
+ CIRRUS LOGIC LOCHNAGAR DRIVER
+ M:    Charles Keepax <[email protected]>
+ M:    Richard Fitzgerald <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ F:    drivers/clk/clk-lochnagar.c
+ F:    drivers/mfd/lochnagar-i2c.c
+ F:    drivers/pinctrl/cirrus/pinctrl-lochnagar.c
+ F:    drivers/regulator/lochnagar-regulator.c
+ F:    include/dt-bindings/clk/lochnagar.h
+ F:    include/dt-bindings/pinctrl/lochnagar.h
+ F:    include/linux/mfd/lochnagar*
+ F:    Documentation/devicetree/bindings/mfd/cirrus,lochnagar.txt
+ F:    Documentation/devicetree/bindings/clock/cirrus,lochnagar.txt
+ F:    Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.txt
+ F:    Documentation/devicetree/bindings/regulator/cirrus,lochnagar.txt
+ 
  CISCO FCOE HBA DRIVER
  M:    Satish Kharat <[email protected]>
  M:    Sesidhar Baddela <[email protected]>
@@@ -3931,9 -4013,10 +4013,10 @@@ M:    Johannes Weiner <[email protected]
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
  S:    Maintained
- F:    Documentation/cgroup*
+ F:    Documentation/admin-guide/cgroup-v2.rst
+ F:    Documentation/cgroup-v1/
  F:    include/linux/cgroup*
- F:    kernel/cgroup*
+ F:    kernel/cgroup/
  
  CONTROL GROUP - CPUSET
  M:    Li Zefan <[email protected]>
@@@ -3981,7 -4064,7 +4064,7 @@@ M:      Viresh Kumar <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
- T:    git git://git.linaro.org/people/vireshk/linux.git (For ARM Updates)
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git (For ARM Updates)
  B:    https://bugzilla.kernel.org
  F:    Documentation/admin-guide/pm/cpufreq.rst
  F:    Documentation/admin-guide/pm/intel_pstate.rst
@@@ -4041,6 -4124,7 +4124,7 @@@ S:      Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
  B:    https://bugzilla.kernel.org
  F:    Documentation/admin-guide/pm/cpuidle.rst
+ F:    Documentation/driver-api/pm/cpuidle.rst
  F:    drivers/cpuidle/*
  F:    include/linux/cpuidle.h
  
@@@ -4148,7 -4232,7 +4232,7 @@@ S:      Maintaine
  F:    drivers/media/dvb-frontends/cxd2820r*
  
  CXGB3 ETHERNET DRIVER (CXGB3)
- M:    Arjun Vynipadath <arjun@chelsio.com>
+ M:    Vishal Kulkarni <vishal@chelsio.com>
  L:    [email protected]
  W:    http://www.chelsio.com
  S:    Supported
@@@ -4177,7 -4261,7 +4261,7 @@@ S:      Supporte
  F:    drivers/crypto/chelsio
  
  CXGB4 ETHERNET DRIVER (CXGB4)
- M:    Arjun Vynipadath <arjun@chelsio.com>
+ M:    Vishal Kulkarni <vishal@chelsio.com>
  L:    [email protected]
  W:    http://www.chelsio.com
  S:    Supported
@@@ -4561,10 -4645,11 +4645,11 @@@ S:   Maintaine
  F:    drivers/i2c/busses/i2c-diolan-u2c.c
  
  FILESYSTEM DIRECT ACCESS (DAX)
- M:    Matthew Wilcox <[email protected]>
- M:    Ross Zwisler <zwisler@kernel.org>
- M:    Jan Kara <[email protected]>
+ M:    Dan Williams <[email protected]>
+ R:    Matthew Wilcox <willy@infradead.org>
+ R:    Jan Kara <[email protected]>
  L:    [email protected]
+ L:    [email protected]
  S:    Supported
  F:    fs/dax.c
  F:    include/linux/dax.h
@@@ -4572,9 -4657,9 +4657,9 @@@ F:      include/trace/events/fs_dax.
  
  DEVICE DIRECT ACCESS (DAX)
  M:    Dan Williams <[email protected]>
- M:    Dave Jiang <[email protected]>
- M:    Ross Zwisler <[email protected]>
  M:    Vishal Verma <[email protected]>
+ M:    Keith Busch <[email protected]>
+ M:    Dave Jiang <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/dax/
@@@ -5124,7 -5209,7 +5209,7 @@@ F:      Documentation/devicetree/bindings/di
  DRM DRIVERS FOR LIMA
  M:    Qiang Yu <[email protected]>
  L:    [email protected]
 -L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/gpu/drm/lima/
  F:    include/uapi/drm/lima_drm.h
@@@ -5229,7 -5314,7 +5314,7 @@@ DRM DRIVERS FOR VIVANTE GPU I
  M:    Lucas Stach <[email protected]>
  R:    Russell King <[email protected]>
  R:    Christian Gmeiner <[email protected]>
- L:    [email protected]
+ L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
  F:    drivers/gpu/drm/etnaviv/
@@@ -5484,6 -5569,12 +5569,12 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/edac/amd64_edac*
  
+ EDAC-AST2500
+ M:    Stefan Schaeckeler <[email protected]>
+ S:    Supported
+ F:    drivers/edac/aspeed_edac.c
+ F:    Documentation/devicetree/bindings/edac/aspeed-sdram-edac.txt
+ 
  EDAC-CALXEDA
  M:    Robert Richter <[email protected]>
  L:    [email protected]
@@@ -5508,6 -5599,7 +5599,7 @@@ F:      drivers/edac/thunderx_edac
  EDAC-CORE
  M:    Borislav Petkov <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
+ R:    James Morse <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git linux_next
@@@ -5940,7 -6032,7 +6032,7 @@@ S:      Maintaine
  F:    drivers/media/tuners/fc2580*
  
  FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
- M:    Johannes Thumshirn <[email protected]>
+ M:    Hannes Reinecke <[email protected]>
  L:    [email protected]
  W:    www.Open-FCoE.org
  S:    Supported
@@@ -5967,6 -6059,7 +6059,7 @@@ L:      [email protected]
  S:    Maintained
  F:    fs/*
  F:    include/linux/fs.h
+ F:    include/linux/fs_types.h
  F:    include/uapi/linux/fs.h
  
  FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
@@@ -6109,6 -6202,12 +6202,12 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/dma/fsldma.*
  
+ FREESCALE ENETC ETHERNET DRIVERS
+ M:    Claudiu Manoil <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/net/ethernet/freescale/enetc/
+ 
  FREESCALE eTSEC ETHERNET DRIVER (GIANFAR)
  M:    Claudiu Manoil <[email protected]>
  L:    [email protected]
@@@ -6172,15 -6271,17 +6271,17 @@@ FREESCALE QORIQ PTP CLOCK DRIVE
  M:    Yangbo Lu <[email protected]>
  L:    [email protected]
  S:    Maintained
+ F:    drivers/net/ethernet/freescale/enetc/enetc_ptp.c
  F:    drivers/ptp/ptp_qoriq.c
+ F:    drivers/ptp/ptp_qoriq_debugfs.c
  F:    include/linux/fsl/ptp_qoriq.h
  F:    Documentation/devicetree/bindings/ptp/ptp-qoriq.txt
  
  FREESCALE QUAD SPI DRIVER
  M:    Han Xu <[email protected]>
- L:    linux-[email protected].org
+ L:    linux-[email protected].org
  S:    Maintained
- F:    drivers/mtd/spi-nor/fsl-quadspi.c
+ F:    drivers/spi/spi-fsl-qspi.c
  
  FREESCALE QUICC ENGINE LIBRARY
  M:    Qiang Zhao <[email protected]>
@@@ -6279,9 -6380,10 +6380,10 @@@ F:    include/linux/fscache*.
  FSCRYPT: FILE SYSTEM LEVEL ENCRYPTION SUPPORT
  M:    Theodore Y. Ts'o <[email protected]>
  M:    Jaegeuk Kim <[email protected]>
+ M:    Eric Biggers <[email protected]>
  L:    [email protected]
  Q:    https://patchwork.kernel.org/project/linux-fscrypt/list/
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git
+ T:    git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git
  S:    Supported
  F:    fs/crypto/
  F:    include/linux/fscrypt*.h
@@@ -6727,6 -6829,15 +6829,15 @@@ F:    drivers/clocksource/h8300_*.
  F:    drivers/clk/h8300/
  F:    drivers/irqchip/irq-renesas-h8*.c
  
+ HABANALABS PCI DRIVER
+ M:    Oded Gabbay <[email protected]>
+ T:    git https://github.com/HabanaAI/linux.git
+ S:    Supported
+ F:    drivers/misc/habanalabs/
+ F:    include/uapi/misc/habanalabs.h
+ F:    Documentation/ABI/testing/sysfs-driver-habanalabs
+ F:    Documentation/ABI/testing/debugfs-driver-habanalabs
+ 
  HACKRF MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
@@@ -7084,7 -7195,7 +7195,7 @@@ M:      Haiyang Zhang <[email protected]
  M:    Stephen Hemminger <[email protected]>
  M:    Sasha Levin <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
- L:    devel@linuxdriverproject.org
+ L:    [email protected].org
  S:    Supported
  F:    Documentation/networking/device_drivers/microsoft/netvsc.txt
  F:    arch/x86/include/asm/mshyperv.h
@@@ -7100,6 -7211,7 +7211,7 @@@ F:      drivers/net/hyperv
  F:    drivers/scsi/storvsc_drv.c
  F:    drivers/uio/uio_hv_generic.c
  F:    drivers/video/fbdev/hyperv_fb.c
+ F:    drivers/iommu/hyperv_iommu.c
  F:    net/vmw_vsock/hyperv_transport.c
  F:    include/linux/hyperv.h
  F:    include/uapi/linux/hyperv.h
@@@ -7249,6 -7361,7 +7361,7 @@@ F:      drivers/i2c/i2c-stub.
  I3C SUBSYSTEM
  M:    Boris Brezillon <[email protected]>
  L:    [email protected]
+ C:    irc://chat.freenode.net/linux-i3c
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-bus-i3c
@@@ -7783,7 -7896,6 +7896,6 @@@ M:      Yong Zhi <[email protected]
  M:    Sakari Ailus <[email protected]>
  M:    Bingbu Cao <[email protected]>
  R:    Tian Shu Qiu <[email protected]>
- R:    Jian Xu Zheng <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/media/pci/intel/ipu3/
@@@ -7968,6 -8080,16 +8080,16 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/gpio/gpio-intel-mid.c
  
+ INTERCONNECT API
+ M:    Georgi Djakov <[email protected]>
+ S:    Maintained
+ F:    Documentation/interconnect/
+ F:    Documentation/devicetree/bindings/interconnect/
+ F:    drivers/interconnect/
+ F:    include/dt-bindings/interconnect/
+ F:    include/linux/interconnect-provider.h
+ F:    include/linux/interconnect.h
+ 
  INVENSENSE MPU-3050 GYROSCOPE DRIVER
  M:    Linus Walleij <[email protected]>
  L:    [email protected]
@@@ -8010,6 -8132,16 +8132,16 @@@ F:    include/linux/iommu.
  F:    include/linux/of_iommu.h
  F:    include/linux/iova.h
  
+ IO_URING
+ M:    Jens Axboe <[email protected]>
+ L:    [email protected]
+ L:    [email protected]
+ T:    git git://git.kernel.dk/linux-block
+ T:    git git://git.kernel.dk/liburing
+ S:    Maintained
+ F:    fs/io_uring.c
+ F:    include/uapi/linux/io_uring.h
+ 
  IP MASQUERADING
  M:    Juanjo Ciarlante <[email protected]>
  S:    Maintained
@@@ -8375,6 -8507,7 +8507,7 @@@ F:      include/linux/kvm
  F:    include/kvm/iodev.h
  F:    virt/kvm/*
  F:    tools/kvm/
+ F:    tools/testing/selftests/kvm/
  
  KERNEL VIRTUAL MACHINE FOR AMD-V (KVM/amd)
  M:    Joerg Roedel <[email protected]>
@@@ -8384,29 -8517,25 +8517,25 @@@ S:   Maintaine
  F:    arch/x86/include/asm/svm.h
  F:    arch/x86/kvm/svm.c
  
- KERNEL VIRTUAL MACHINE FOR ARM (KVM/arm)
+ KERNEL VIRTUAL MACHINE FOR ARM/ARM64 (KVM/arm, KVM/arm64)
  M:    Christoffer Dall <[email protected]>
  M:    Marc Zyngier <[email protected]>
+ R:    James Morse <[email protected]>
+ R:    Julien Thierry <[email protected]>
+ R:    Suzuki K Pouloze <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  W:    http://systems.cs.columbia.edu/projects/kvm-arm
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
- S:    Supported
+ S:    Maintained
  F:    arch/arm/include/uapi/asm/kvm*
  F:    arch/arm/include/asm/kvm*
  F:    arch/arm/kvm/
- F:    virt/kvm/arm/
- F:    include/kvm/arm_*
- 
- KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
- M:    Christoffer Dall <[email protected]>
- M:    Marc Zyngier <[email protected]>
- L:    [email protected] (moderated for non-subscribers)
- L:    [email protected]
- S:    Maintained
  F:    arch/arm64/include/uapi/asm/kvm*
  F:    arch/arm64/include/asm/kvm*
  F:    arch/arm64/kvm/
+ F:    virt/kvm/arm/
+ F:    include/kvm/arm_*
  
  KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
  M:    James Hogan <[email protected]>
@@@ -8486,7 -8615,7 +8615,7 @@@ F:      security/keys/encrypted-keys
  KEYS-TRUSTED
  M:    James Bottomley <[email protected]>
  M:      Jarkko Sakkinen <[email protected]>
- M:    Mimi Zohar <[email protected]>
+ M:    Mimi Zohar <zohar@linux.ibm.com>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -8729,7 -8858,6 +8858,6 @@@ S:      Maintaine
  F:    tools/lib/lockdep/
  
  LIBNVDIMM BLK: MMIO-APERTURE DRIVER
- M:    Ross Zwisler <[email protected]>
  M:    Dan Williams <[email protected]>
  M:    Vishal Verma <[email protected]>
  M:    Dave Jiang <[email protected]>
@@@ -8742,7 -8870,6 +8870,6 @@@ F:      drivers/nvdimm/region_devs.
  LIBNVDIMM BTT: BLOCK TRANSLATION TABLE
  M:    Vishal Verma <[email protected]>
  M:    Dan Williams <[email protected]>
- M:    Ross Zwisler <[email protected]>
  M:    Dave Jiang <[email protected]>
  L:    [email protected]
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
@@@ -8750,7 -8877,6 +8877,6 @@@ S:      Supporte
  F:    drivers/nvdimm/btt*
  
  LIBNVDIMM PMEM: PERSISTENT MEMORY DRIVER
- M:    Ross Zwisler <[email protected]>
  M:    Dan Williams <[email protected]>
  M:    Vishal Verma <[email protected]>
  M:    Dave Jiang <[email protected]>
@@@ -8769,9 -8895,10 +8895,10 @@@ F:    Documentation/devicetree/bindings/pm
  
  LIBNVDIMM: NON-VOLATILE MEMORY DEVICE SUBSYSTEM
  M:    Dan Williams <[email protected]>
- M:    Ross Zwisler <[email protected]>
  M:    Vishal Verma <[email protected]>
  M:    Dave Jiang <[email protected]>
+ M:    Keith Busch <[email protected]>
+ M:    Ira Weiny <[email protected]>
  L:    [email protected]
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git
@@@ -8919,10 -9046,10 +9046,10 @@@ F:   drivers/platform/x86/hp_accel.
  
  LIVE PATCHING
  M:    Josh Poimboeuf <[email protected]>
- M:    Jessica Yu <[email protected]>
  M:    Jiri Kosina <[email protected]>
  M:    Miroslav Benes <[email protected]>
- R:    Petr Mladek <[email protected]>
+ M:    Petr Mladek <[email protected]>
+ R:    Joe Lawrence <[email protected]>
  S:    Maintained
  F:    kernel/livepatch/
  F:    include/linux/livepatch.h
@@@ -8931,8 -9058,9 +9058,9 @@@ F:      arch/x86/kernel/livepatch.
  F:    Documentation/livepatch/
  F:    Documentation/ABI/testing/sysfs-kernel-livepatch
  F:    samples/livepatch/
+ F:    tools/testing/selftests/livepatch/
  L:    [email protected]
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git
  
  LLC (802.2)
  L:    [email protected]
@@@ -9170,6 -9298,14 +9298,14 @@@ F:    drivers/gpu/drm/armada
  F:    include/uapi/drm/armada_drm.h
  F:    Documentation/devicetree/bindings/display/armada/
  
+ MARVELL ARMADA 3700 PHY DRIVERS
+ M:    Miquel Raynal <[email protected]>
+ S:    Maintained
+ F:    drivers/phy/marvell/phy-mvebu-a3700-comphy.c
+ F:    drivers/phy/marvell/phy-mvebu-a3700-utmi.c
+ F:    Documentation/devicetree/bindings/phy/phy-mvebu-comphy.txt
+ F:    Documentation/devicetree/bindings/phy/phy-mvebu-utmi.txt
+ 
  MARVELL CRYPTO DRIVER
  M:    Boris Brezillon <[email protected]>
  M:    Arnaud Ebalard <[email protected]>
@@@ -9438,6 -9574,17 +9574,17 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/platform/imx-pxp.[ch]
  
+ MEDIA DRIVERS FOR FREESCALE IMX7
+ M:    Rui Miguel Silva <[email protected]>
+ L:    [email protected]
+ T:    git git://linuxtv.org/media_tree.git
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/media/imx7-csi.txt
+ F:    Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt
+ F:    Documentation/media/v4l-drivers/imx7.rst
+ F:    drivers/staging/media/imx/imx7-media-csi.c
+ F:    drivers/staging/media/imx/imx7-mipi-csis.c
+ 
  MEDIA DRIVERS FOR HELENE
  M:    Abylay Ospan <[email protected]>
  L:    [email protected]
@@@ -9799,6 -9946,7 +9946,7 @@@ M:      Vadim Pasternak <[email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/platform/mellanox/
+ F:    include/linux/platform_data/mlxreg.h
  
  MELLANOX MLX4 core VPI driver
  M:    Tariq Toukan <[email protected]>
@@@ -9873,6 -10021,14 +10021,14 @@@ F:  kernel/sched/membarrier.
  F:    include/uapi/linux/membarrier.h
  F:    arch/powerpc/include/asm/membarrier.h
  
+ MEMBLOCK
+ M:    Mike Rapoport <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    include/linux/memblock.h
+ F:    mm/memblock.c
+ F:    Documentation/core-api/boot-time-mm.rst
+ 
  MEMORY MANAGEMENT
  L:    [email protected]
  W:    http://www.linux-mm.org
@@@ -9939,6 -10095,18 +10095,18 @@@ F:  drivers/media/platform/meson/ao-cec.
  F:    Documentation/devicetree/bindings/media/meson-ao-cec.txt
  T:    git git://linuxtv.org/media_tree.git
  
+ MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
+ M:    Liang Yang <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/mtd/nand/raw/meson_*
+ F:    Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt
+ 
+ METHODE UDPU SUPPORT
+ M:    Vladimir Vid <[email protected]>
+ S:    Maintained
+ F:    arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
+ 
  MICROBLAZE ARCHITECTURE
  M:    Michal Simek <[email protected]>
  W:    http://www.monstr.eu/fdt/
@@@ -10663,6 -10831,7 +10831,7 @@@ F:   Documentation/devicetree/bindings/ne
  F:    net/dsa/
  F:    include/net/dsa.h
  F:    include/linux/dsa/
+ F:    include/linux/platform_data/dsa.h
  F:    drivers/net/dsa/
  
  NETWORKING [GENERAL]
@@@ -10878,6 -11047,12 +11047,12 @@@ F: drivers/power/supply/bq27xxx_battery
  F:    drivers/power/supply/isp1704_charger.c
  F:    drivers/power/supply/rx51_battery.c
  
+ NOLIBC HEADER FILE
+ M:    Willy Tarreau <[email protected]>
+ S:    Maintained
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wtarreau/nolibc.git
+ F:    tools/include/nolibc/
+ 
  NTB AMD DRIVER
  M:    Shyam Sundar S K <[email protected]>
  L:    [email protected]
@@@ -11017,6 -11192,14 +11192,14 @@@ F: lib/objagg.
  F:    lib/test_objagg.c
  F:    include/linux/objagg.h
  
+ NXP FSPI DRIVER
+ R:    Yogesh Gaur <[email protected]>
+ M:    Ashish Kumar <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/spi/spi-nxp-fspi.c
+ F:    Documentation/devicetree/bindings/spi/spi-nxp-fspi.txt
+ 
  OBJTOOL
  M:    Josh Poimboeuf <[email protected]>
  M:    Peter Zijlstra <[email protected]>
@@@ -11318,6 -11501,19 +11501,19 @@@ S: Maintaine
  F:    drivers/media/i2c/ov7740.c
  F:    Documentation/devicetree/bindings/media/i2c/ov7740.txt
  
+ OMNIVISION OV9640 SENSOR DRIVER
+ M:    Petr Cvek <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/media/i2c/ov9640.*
+ 
+ OMNIVISION OV8856 SENSOR DRIVER
+ M:    Ben Kao <[email protected]>
+ L:    [email protected]
+ T:    git git://linuxtv.org/media_tree.git
+ S:    Maintained
+ F:    drivers/media/i2c/ov8856.c
+ 
  OMNIVISION OV9650 SENSOR DRIVER
  M:    Sakari Ailus <[email protected]>
  R:    Akinobu Mita <[email protected]>
@@@ -11350,6 -11546,11 +11546,11 @@@ M: Jens Wiklander <jens.wiklander@linar
  S:    Maintained
  F:    drivers/tee/optee/
  
+ OP-TEE RANDOM NUMBER GENERATOR (RNG) DRIVER
+ M:    Sumit Garg <[email protected]>
+ S:    Maintained
+ F:    drivers/char/hw_random/optee-rng.c
+ 
  OPA-VNIC DRIVER
  M:    Dennis Dalessandro <[email protected]>
  M:    Niranjana Vishwanathapura <[email protected]>
@@@ -11477,13 -11678,6 +11678,6 @@@ W:  http://www.nongnu.org/orinoco
  S:    Orphan
  F:    drivers/net/wireless/intersil/orinoco/
  
- OSD LIBRARY and FILESYSTEM
- M:    Boaz Harrosh <[email protected]>
- S:    Maintained
- F:    drivers/scsi/osd/
- F:    include/scsi/osd_*
- F:    fs/exofs/
- 
  OV2659 OMNIVISION SENSOR DRIVER
  M:    "Lad, Prabhakar" <[email protected]>
  L:    [email protected]
@@@ -11596,6 -11790,11 +11790,11 @@@ F: lib/parman.
  F:    lib/test_parman.c
  F:    include/linux/parman.h
  
+ PC ENGINES APU BOARD DRIVER
+ M:    Enrico Weigelt, metux IT consult <[email protected]>
+ S:    Maintained
+ F:    drivers/platform/x86/pcengines-apuv2.c
+ 
  PC87360 HARDWARE MONITORING DRIVER
  M:    Jim Cromie <[email protected]>
  L:    [email protected]
@@@ -11649,7 -11848,7 +11848,7 @@@ F:   Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/pcie-altera.c
  
  PCI DRIVER FOR APPLIEDMICRO XGENE
- M:    Tanmay Inamdar <tinamdar@apm.com>
+ M:    Toan Le <[email protected].com>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -11673,7 -11872,7 +11872,7 @@@ F:   Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/dwc/pcie-armada8k.c
  
  PCI DRIVER FOR CADENCE PCIE IP
- M:    Alan Douglas <adouglas@cadence.com>
+ M:    Tom Joseph <tjoseph@cadence.com>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/cdns,*.txt
@@@ -11827,7 -12026,7 +12026,7 @@@ F:   Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/pcie-altera-msi.c
  
  PCI MSI DRIVER FOR APPLIEDMICRO XGENE
- M:    Duc Dang <dhdang@apm.com>
+ M:    Toan Le <[email protected].com>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -12316,14 -12515,6 +12515,6 @@@ S:  Maintaine
  F:    drivers/net/ppp/pptp.c
  W:    http://sourceforge.net/projects/accel-pptp
  
- PREEMPTIBLE KERNEL
- M:    Robert Love <[email protected]>
- L:    [email protected]
- W:    https://www.kernel.org/pub/linux/kernel/people/rml/preempt-kernel
- S:    Supported
- F:    Documentation/preempt-locking.txt
- F:    include/linux/preempt.h
- 
  PRINTK
  M:    Petr Mladek <[email protected]>
  M:    Sergey Senozhatsky <[email protected]>
@@@ -12460,6 -12651,7 +12651,7 @@@ L:   [email protected]
  T:    git git://linuxtv.org/media_tree.git
  S:    Odd Fixes
  F:    drivers/media/usb/pwc/*
+ F:    include/trace/events/pwc.h
  
  PWM FAN DRIVER
  M:    Kamil Debski <[email protected]>
@@@ -12685,11 -12877,11 +12877,11 @@@ F:        Documentation/media/v4l-drivers/qcom
  F:    drivers/media/platform/qcom/camss/
  
  QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
- M:  Ilia Lin <[email protected]>
- L:  [email protected]
- S:  Maintained
- F:  Documentation/devicetree/bindings/opp/kryo-cpufreq.txt
- F:  drivers/cpufreq/qcom-cpufreq-kryo.c
+ M:    Ilia Lin <[email protected]>
+ L:    [email protected]
+ 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 <[email protected]>
@@@ -12697,6 -12889,14 +12889,14 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/qualcomm/emac/
  
+ QUALCOMM ETHQOS ETHERNET DRIVER
+ M:    Vinod Koul <[email protected]>
+ M:    Niklas Cassel <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+ F:    Documentation/devicetree/bindings/net/qcom,dwmac.txt
+ 
  QUALCOMM GENERIC INTERFACE I2C DRIVER
  M:    Alok Chauhan <[email protected]>
  M:    Karthikeyan Ramasubramanian <[email protected]>
@@@ -12856,6 -13056,16 +13056,16 @@@ M: Alexandre Bounine <[email protected]
  S:    Maintained
  F:    drivers/rapidio/
  
+ RAS INFRASTRUCTURE
+ M:    Tony Luck <[email protected]>
+ M:    Borislav Petkov <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/ras/
+ F:    include/linux/ras.h
+ F:    include/ras/ras_event.h
+ F:    Documentation/admin-guide/ras.rst
+ 
  RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER
  L:    [email protected]
  S:    Orphan
@@@ -13053,6 -13263,7 +13263,7 @@@ F:   drivers/reset
  F:    Documentation/devicetree/bindings/reset/
  F:    include/dt-bindings/reset/
  F:    include/linux/reset.h
+ F:    include/linux/reset/
  F:    include/linux/reset-controller.h
  
  RESTARTABLE SEQUENCES SUPPORT
@@@ -13553,6 -13764,7 +13764,7 @@@ F:   kernel/sched
  F:    include/linux/sched.h
  F:    include/uapi/linux/sched.h
  F:    include/linux/wait.h
+ F:    include/linux/preempt.h
  
  SCR24X CHIP CARD INTERFACE DRIVER
  M:    Lubomir Rintel <[email protected]>
@@@ -13596,6 -13808,7 +13808,7 @@@ M:   "James E.J. Bottomley" <[email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
  M:    "Martin K. Petersen" <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
+ Q:    https://patchwork.kernel.org/project/linux-scsi/list/
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/scsi/
@@@ -13610,6 -13823,18 +13823,18 @@@ F: Documentation/scsi/st.tx
  F:    drivers/scsi/st.*
  F:    drivers/scsi/st_*.h
  
+ SCSI TARGET SUBSYSTEM
+ M:    "Martin K. Petersen" <[email protected]>
+ L:    [email protected]
+ L:    [email protected]
+ W:    http://www.linux-iscsi.org
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
+ Q:    https://patchwork.kernel.org/project/target-devel/list/
+ S:    Supported
+ F:    drivers/target/
+ F:    include/target/
+ F:    Documentation/target/
+ 
  SCTP PROTOCOL
  M:    Vlad Yasevich <[email protected]>
  M:    Neil Horman <[email protected]>
@@@ -13681,11 -13906,18 +13906,18 @@@ F:        drivers/mmc/host/sdhci-brcmstb
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
  M:    Adrian Hunter <[email protected]>
  L:    [email protected]
- T:    git git://git.infradead.org/users/ahunter/linux-sdhci.git
  S:    Maintained
  F:    drivers/mmc/host/sdhci*
  F:    include/linux/mmc/sdhci*
  
+ EMMC CMDQ HOST CONTROLLER INTERFACE (CQHCI) DRIVER
+ M:    Adrian Hunter <[email protected]>
+ M:    Ritesh Harjani <[email protected]>
+ M:    Asutosh Das <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/mmc/host/cqhci*
+ 
  SYNOPSYS SDHCI COMPLIANT DWC MSHC DRIVER
  M:    Prabu Thangamuthu <[email protected]>
  M:    Manjunath M B <[email protected]>
@@@ -13821,6 -14053,7 +14053,7 @@@ F:   drivers/misc/sgi-xp
  
  SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
  M:    Ursula Braun <[email protected]>
+ M:    Karsten Graul <[email protected]>
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -14412,6 -14645,7 +14645,7 @@@ F:   arch/arm/mach-spear
  
  SPI NOR SUBSYSTEM
  M:    Marek Vasut <[email protected]>
+ M:    Tudor Ambarus <[email protected]>
  L:    [email protected]
  W:    http://www.linux-mtd.infradead.org/
  Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
@@@ -14576,11 -14810,6 +14810,6 @@@ L:  [email protected]
  S:    Supported
  F:    drivers/staging/wilc1000/
  
- STAGING - XGI Z7,Z9,Z11 PCI DISPLAY DRIVER
- M:    Arnaud Patard <[email protected]>
- S:    Odd Fixes
- F:    drivers/staging/xgifb/
- 
  STAGING SUBSYSTEM
  M:    Greg Kroah-Hartman <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
@@@ -14785,7 -15014,7 +15014,7 @@@ S:   Maintaine
  F:    drivers/tty/serial/8250/8250_dw.c
  
  SYNOPSYS DESIGNWARE APB GPIO DRIVER
- M:    Hoan Tran <hotran@apm.com>
+ M:    Hoan Tran <ho[email protected].com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/gpio/gpio-dwapb.c
@@@ -14877,18 -15106,6 +15106,6 @@@ F:  Documentation/filesystems/sysv-fs.tx
  F:    fs/sysv/
  F:    include/linux/sysv_fs.h
  
- TARGET SUBSYSTEM
- M:    "Nicholas A. Bellinger" <[email protected]>
- L:    [email protected]
- L:    [email protected]
- W:    http://www.linux-iscsi.org
- W:    http://groups.google.com/group/linux-iscsi-target-dev
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git master
- S:    Supported
- F:    drivers/target/
- F:    include/target/
- F:    Documentation/target/
- 
  TASKSTATS STATISTICS INTERFACE
  M:    Balbir Singh <[email protected]>
  S:    Maintained
@@@ -15175,6 -15392,13 +15392,13 @@@ L: [email protected] (moderat
  S:    Maintained
  F:    sound/soc/ti/
  
+ Texas Instruments' DAC7612 DAC Driver
+ M:    Ricardo Ribalda <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ F:    drivers/iio/dac/ti-dac7612.c
+ F:    Documentation/devicetree/bindings/iio/dac/ti,dac7612.txt
+ 
  THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
@@@ -15486,12 -15710,11 +15710,11 @@@ F:        mm/shmem.
  TOMOYO SECURITY MODULE
  M:    Kentaro Takeda <[email protected]>
  M:    Tetsuo Handa <[email protected]>
- L:    [email protected] (subscribers-only, for developers in English)
- L:    [email protected] (subscribers-only, for users in English)
- L:    [email protected] (subscribers-only, for developers in Japanese)
- L:    [email protected] (subscribers-only, for users in Japanese)
- W:    http://tomoyo.sourceforge.jp/
- T:    quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.5.x/tomoyo-lsm/patches/
+ L:    [email protected] (subscribers-only, for developers in English)
+ L:    [email protected] (subscribers-only, for users in English)
+ L:    [email protected] (subscribers-only, for developers in Japanese)
+ L:    [email protected] (subscribers-only, for users in Japanese)
+ W:    https://tomoyo.osdn.jp/
  S:    Maintained
  F:    security/tomoyo/
  
@@@ -15780,14 -16003,16 +16003,16 @@@ F:        drivers/visorbus
  F:    drivers/staging/unisys/
  
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
- M:    Vinayak Holikatti <[email protected]>
+ R:    Alim Akhtar <[email protected]>
+ R:    Avri Altman <[email protected]>
+ R:    Pedro Sousa <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/scsi/ufs.txt
  F:    drivers/scsi/ufs/
  
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER DWC HOOKS
- M:    Joao Pinto <jpinto@synopsys.com>
+ M:    Pedro Sousa <pedrom.sousa@synopsys.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/ufs/*dwc*
@@@ -16572,6 -16797,12 +16797,12 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/gpio/gpio-wcove.c
  
+ WHWAVE RTC DRIVER
+ M:    Dianlong Li <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/rtc/rtc-sd3078.c
+ 
  WIIMOTE HID DRIVER
  M:    David Herrmann <[email protected]>
  L:    [email protected]
@@@ -16603,6 -16834,11 +16834,11 @@@ M: David Härdeman <[email protected]
  S:    Maintained
  F:    drivers/media/rc/winbond-cir.c
  
+ RCMM REMOTE CONTROLS DECODER
+ M:    Patrick Lerda <[email protected]>
+ S:    Maintained
+ F:    drivers/media/rc/ir-rcmm-decoder.c
+ 
  WINSYSTEMS EBC-C384 WATCHDOG DRIVER
  M:    William Breathitt Gray <[email protected]>
  L:    [email protected]

diff --combined drivers/gpu/drm/Makefile
index 55d8deb68d4517d95f3381c6cab27784c192720a,d97c0a3a8cfce699f50515860e3de749d50d5b24..7ebae3d455059c55187e23be0f5e8f150fd68d6b
--- 1/drivers/gpu/drm/Makefile
--- 2/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@@ -38,8 -38,7 +38,8 @@@ drm_kms_helper-y := drm_crtc_helper.o d
                drm_kms_helper_common.o drm_dp_dual_mode_helper.o \
                drm_simple_kms_helper.o drm_modeset_helper.o \
                drm_scdc_helper.o drm_gem_framebuffer_helper.o \
 -              drm_atomic_state_helper.o drm_damage_helper.o
 +              drm_atomic_state_helper.o drm_damage_helper.o \
 +              drm_format_helper.o
  
  drm_kms_helper-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o
  drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o
@@@ -58,7 -57,6 +58,6 @@@ obj-$(CONFIG_DRM_TTM) += ttm
  obj-$(CONFIG_DRM_SCHED)       += scheduler/
  obj-$(CONFIG_DRM_TDFX)        += tdfx/
  obj-$(CONFIG_DRM_R128)        += r128/
- obj-y                 += amd/lib/
  obj-$(CONFIG_HSA_AMD) += amd/amdkfd/
  obj-$(CONFIG_DRM_RADEON)+= radeon/
  obj-$(CONFIG_DRM_AMDGPU)+= amd/amdgpu/

diff --combined drivers/gpu/drm/bochs/bochs.h
index 36f6ee725d132385d85136ca419004810f21c607,049d058571d42b109e743fa89dda71063c5330de..341cc9d1bab4e22d8dd3755fe32f4d9fd0ae8d97
--- 1/drivers/gpu/drm/bochs/bochs.h
--- 2/drivers/gpu/drm/bochs/bochs.h
+++ b/drivers/gpu/drm/bochs/bochs.h
@@@ -7,7 -7,6 +7,7 @@@
  #include <drm/drm_crtc_helper.h>
  #include <drm/drm_encoder.h>
  #include <drm/drm_fb_helper.h>
 +#include <drm/drm_simple_kms_helper.h>
  
  #include <drm/drm_gem.h>
  
@@@ -70,8 -69,9 +70,8 @@@ struct bochs_device 
        struct edid *edid;
  
        /* drm */
 -      struct drm_device  *dev;
 -      struct drm_crtc crtc;
 -      struct drm_encoder encoder;
 +      struct drm_device *dev;
 +      struct drm_simple_display_pipe pipe;
        struct drm_connector connector;
  
        /* ttm */
@@@ -100,8 -100,6 +100,6 @@@ static inline struct bochs_bo *gem_to_b
        return container_of(gem, struct bochs_bo, gem);
  }
  
- #define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
- 
  static inline u64 bochs_bo_mmap_offset(struct bochs_bo *bo)
  {
        return drm_vma_node_offset_addr(&bo->bo.vma_node);