Merge tag 'devicetree-for-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git...

author Linus Torvalds <torvalds@linux-foundation.org>

Sat, 29 Dec 2018 04:08:34 +0000 (20:08 -0800)

committer Linus Torvalds <torvalds@linux-foundation.org>

Sat, 29 Dec 2018 04:08:34 +0000 (20:08 -0800)
author Linus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Dec 2018 04:08:34 +0000 (20:08 -0800)
committer Linus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Dec 2018 04:08:34 +0000 (20:08 -0800)
diff --combined MAINTAINERS

index 966dc32,9806ca8..67e448e
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -140,7 -140,7 +140,7 @@@ Maintainers List (try to look for most 
   M:    Steffen Klassert <klassert@kernel.org>
   L:    netdev@vger.kernel.org
   S:    Odd Fixes
- -F:    Documentation/networking/vortex.txt
+ +F:    Documentation/networking/device_drivers/3com/vortex.txt
   F:    drivers/net/ethernet/3com/3c59x.c
   
   3CR990 NETWORK DRIVER
@@@ -180,7 -180,6 +180,7 @@@ F: drivers/net/hamradio/6pack.
   
   8169 10/100/1000 GIGABIT ETHERNET DRIVER
   M:    Realtek linux nic maintainers <nic_swsd@realtek.com>
+ +M:    Heiner Kallweit <hkallweit1@gmail.com>
   L:    netdev@vger.kernel.org
   S:    Maintained
   F:    drivers/net/ethernet/realtek/r8169.c
@@@ -718,7 -717,7 +718,7 @@@ F: include/linux/mfd/altera-a10sr.
   F:    include/dt-bindings/reset/altr,rst-mgr-a10sr.h
   
   ALTERA TRIPLE SPEED ETHERNET DRIVER
- -M:    Vince Bridgers <vbridger@opensource.altera.com>
+ +M:    Thor Thayer <thor.thayer@linux.intel.com>
   L:    netdev@vger.kernel.org
   L:    nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
   S:    Maintained
@@@ -740,7 -739,7 +740,7 @@@ R: Saeed Bishara <saeedb@amazon.com
   R:    Zorik Machulsky <zorik@amazon.com>
   L:    netdev@vger.kernel.org
   S:    Supported
- -F:    Documentation/networking/ena.txt
+ +F:    Documentation/networking/device_drivers/amazon/ena.txt
   F:    drivers/net/ethernet/amazon/
   
   AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
@@@ -1310,13 -1309,6 +1310,13 @@@ F:    drivers/pinctrl/meson
   F:    drivers/mmc/host/meson*
   N:    meson
   
+ +ARM/Amlogic Meson SoC Sound Drivers
+ +M:    Jerome Brunet <jbrunet@baylibre.com>
+ +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
+ +S:    Maintained
+ +F:    sound/soc/meson/
+ +F:    Documentation/devicetree/bindings/sound/amlogic*
+ +
   ARM/Annapurna Labs ALPINE ARCHITECTURE
   M:    Tsahee Zidenberg <tsahee@annapurnalabs.com>
   M:    Antoine Tenart <antoine.tenart@bootlin.com>
@@@ -1479,7 -1471,6 +1479,7 @@@ F:      drivers/clk/sirf
   F:    drivers/clocksource/timer-prima2.c
   F:    drivers/clocksource/timer-atlas7.c
   N:    [^a-z]sirf
+ +X:    drivers/gnss
   
   ARM/EBSA110 MACHINE SUPPORT
   M:    Russell King <linux@armlinux.org.uk>
@@@ -1746,17 -1737,13 +1746,17 @@@ ARM/Mediatek SoC suppor
   M:    Matthias Brugger <matthias.bgg@gmail.com>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
+ +W:    https://mtk.bcnfs.org/
+ +C:    irc://chat.freenode.net/linux-mediatek
   S:    Maintained
   F:    arch/arm/boot/dts/mt6*
   F:    arch/arm/boot/dts/mt7*
   F:    arch/arm/boot/dts/mt8*
   F:    arch/arm/mach-mediatek/
   F:    arch/arm64/boot/dts/mediatek/
+ +F:    drivers/soc/mediatek/
   N:    mtk
+ +N:    mt[678]
   K:    mediatek
   
   ARM/Mediatek USB3 PHY DRIVER
@@@ -1935,6 -1922,7 +1935,6 @@@ ARM/QUALCOMM SUPPOR
   M:    Andy Gross <andy.gross@linaro.org>
   M:    David Brown <david.brown@linaro.org>
   L:    linux-arm-msm@vger.kernel.org
- -L:    linux-soc@vger.kernel.org
   S:    Maintained
   F:    Documentation/devicetree/bindings/soc/qcom/
   F:    arch/arm/boot/dts/qcom-*.dts
@@@ -2074,6 -2062,7 +2074,6 @@@ M:      Andrzej Hajda <a.hajda@samsung.com
   L:    linux-arm-kernel@lists.infradead.org
   L:    linux-media@vger.kernel.org
   S:    Maintained
- -F:    arch/arm/plat-samsung/s5p-dev-mfc.c
   F:    drivers/media/platform/s5p-mfc/
   
   ARM/SHMOBILE ARM ARCHITECTURE
@@@ -2353,7 -2342,7 +2353,7 @@@ F:      drivers/pinctrl/zte
   F:    drivers/soc/zte/
   F:    drivers/thermal/zx2967_thermal.c
   F:    drivers/watchdog/zx2967_wdt.c
- F:    Documentation/devicetree/bindings/arm/zte.txt
+ F:    Documentation/devicetree/bindings/arm/zte.yaml
   F:    Documentation/devicetree/bindings/clock/zx2967*.txt
   F:    Documentation/devicetree/bindings/dma/zxdma.txt
   F:    Documentation/devicetree/bindings/gpio/zx296702-gpio.txt
@@@ -2425,14 -2414,6 +2425,14 @@@ S:    Maintaine
   F:    Documentation/hwmon/asc7621
   F:    drivers/hwmon/asc7621.c
   
+ +ASPEED VIDEO ENGINE DRIVER
+ +M:    Eddie James <eajames@linux.ibm.com>
+ +L:    linux-media@vger.kernel.org
+ +L:    openbmc@lists.ozlabs.org (moderated for non-subscribers)
+ +S:    Maintained
+ +F:    drivers/media/platform/aspeed-video.c
+ +F:    Documentation/devicetree/bindings/media/aspeed-video.txt
+ +
   ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
   M:    Corentin Chary <corentin.chary@gmail.com>
   L:    acpi4asus-user@lists.sourceforge.net
@@@ -2509,7 -2490,7 +2509,7 @@@ F:      drivers/net/wireless/ath/
   ATHEROS ATH5K WIRELESS DRIVER
   M:    Jiri Slaby <jirislaby@gmail.com>
   M:    Nick Kossifidis <mickflemm@gmail.com>
- -M:    "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
+ +M:    Luis Chamberlain <mcgrof@kernel.org>
   L:    linux-wireless@vger.kernel.org
   W:    http://wireless.kernel.org/en/users/Drivers/ath5k
   S:    Maintained
@@@ -2647,13 -2628,6 +2647,13 @@@ S:    Maintaine
   F:    Documentation/devicetree/bindings/sound/axentia,*
   F:    sound/soc/atmel/tse850-pcm5142.c
   
+ +AXXIA I2C CONTROLLER
+ +M:    Krzysztof Adamski <krzysztof.adamski@nokia.com>
+ +L:    linux-i2c@vger.kernel.org
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/i2c/i2c-axxia.txt
+ +F:    drivers/i2c/busses/i2c-axxia.c
+ +
   AZ6007 DVB DRIVER
   M:    Mauro Carvalho Chehab <mchehab@kernel.org>
   L:    linux-media@vger.kernel.org
@@@ -2826,7 -2800,7 +2826,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
   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:    arch/*/net/*
   F:    Documentation/networking/filter.txt
   F:    Documentation/bpf/
   F:    include/linux/bpf*
@@@ -2846,67 -2820,6 +2846,67 @@@ F:    tools/bpf
   F:    tools/lib/bpf/
   F:    tools/testing/selftests/bpf/
   
+ +BPF JIT for ARM
+ +M:    Shubham Bansal <illusionist.neo@gmail.com>
+ +L:    netdev@vger.kernel.org
+ +S:    Maintained
+ +F:    arch/arm/net/
+ +
+ +BPF JIT for ARM64
+ +M:    Daniel Borkmann <daniel@iogearbox.net>
+ +M:    Alexei Starovoitov <ast@kernel.org>
+ +M:    Zi Shen Lim <zlim.lnx@gmail.com>
+ +L:    netdev@vger.kernel.org
+ +S:    Supported
+ +F:    arch/arm64/net/
+ +
+ +BPF JIT for MIPS (32-BIT AND 64-BIT)
+ +M:    Paul Burton <paul.burton@mips.com>
+ +L:    netdev@vger.kernel.org
+ +S:    Maintained
+ +F:    arch/mips/net/
+ +
+ +BPF JIT for NFP NICs
+ +M:    Jakub Kicinski <jakub.kicinski@netronome.com>
+ +L:    netdev@vger.kernel.org
+ +S:    Supported
+ +F:    drivers/net/ethernet/netronome/nfp/bpf/
+ +
+ +BPF JIT for POWERPC (32-BIT AND 64-BIT)
+ +M:    Naveen N. Rao <naveen.n.rao@linux.ibm.com>
+ +M:    Sandipan Das <sandipan@linux.ibm.com>
+ +L:    netdev@vger.kernel.org
+ +S:    Maintained
+ +F:    arch/powerpc/net/
+ +
+ +BPF JIT for S390
+ +M:    Martin Schwidefsky <schwidefsky@de.ibm.com>
+ +M:    Heiko Carstens <heiko.carstens@de.ibm.com>
+ +L:    netdev@vger.kernel.org
+ +S:    Maintained
+ +F:    arch/s390/net/
+ +X:    arch/s390/net/pnet.c
+ +
+ +BPF JIT for SPARC (32-BIT AND 64-BIT)
+ +M:    David S. Miller <davem@davemloft.net>
+ +L:    netdev@vger.kernel.org
+ +S:    Maintained
+ +F:    arch/sparc/net/
+ +
+ +BPF JIT for X86 32-BIT
+ +M:    Wang YanQing <udknight@gmail.com>
+ +L:    netdev@vger.kernel.org
+ +S:    Maintained
+ +F:    arch/x86/net/bpf_jit_comp32.c
+ +
+ +BPF JIT for X86 64-BIT
+ +M:    Alexei Starovoitov <ast@kernel.org>
+ +M:    Daniel Borkmann <daniel@iogearbox.net>
+ +L:    netdev@vger.kernel.org
+ +S:    Supported
+ +F:    arch/x86/net/
+ +X:    arch/x86/net/bpf_jit_comp32.c
+ +
   BROADCOM B44 10/100 ETHERNET DRIVER
   M:    Michael Chan <michael.chan@broadcom.com>
   L:    netdev@vger.kernel.org
@@@ -2947,7 -2860,7 +2947,7 @@@ F:      drivers/staging/vc04_service
   BROADCOM BCM47XX MIPS ARCHITECTURE
   M:    Hauke Mehrtens <hauke@hauke-m.de>
   M:    Rafał Miłecki <zajec5@gmail.com>
- -L:    linux-mips@linux-mips.org
+ +L:    linux-mips@vger.kernel.org
   S:    Maintained
   F:    Documentation/devicetree/bindings/mips/brcm/
   F:    arch/mips/bcm47xx/*
@@@ -2956,6 -2869,7 +2956,6 @@@ F:      arch/mips/include/asm/mach-bcm47xx/
   BROADCOM BCM5301X ARM ARCHITECTURE
   M:    Hauke Mehrtens <hauke@hauke-m.de>
   M:    Rafał Miłecki <zajec5@gmail.com>
- -M:    Jon Mason <jonmason@broadcom.com>
   M:    bcm-kernel-feedback-list@broadcom.com
   L:    linux-arm-kernel@lists.infradead.org
   S:    Maintained
@@@ -3010,7 -2924,7 +3010,7 @@@ F:      drivers/cpufreq/bmips-cpufreq.
   BROADCOM BMIPS MIPS ARCHITECTURE
   M:    Kevin Cernekee <cernekee@gmail.com>
   M:    Florian Fainelli <f.fainelli@gmail.com>
- -L:    linux-mips@linux-mips.org
+ +L:    linux-mips@vger.kernel.org
   T:    git git://github.com/broadcom/stblinux.git
   S:    Maintained
   F:    arch/mips/bmips/*
@@@ -3101,6 -3015,7 +3101,6 @@@ F:      drivers/net/ethernet/broadcom/genet
   BROADCOM IPROC ARM ARCHITECTURE
   M:    Ray Jui <rjui@broadcom.com>
   M:    Scott Branden <sbranden@broadcom.com>
- -M:    Jon Mason <jonmason@broadcom.com>
   M:    bcm-kernel-feedback-list@broadcom.com
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   T:    git git://github.com/broadcom/cygnus-linux.git
@@@ -3147,7 -3062,7 +3147,7 @@@ F:      include/uapi/rdma/bnxt_re-abi.
   
   BROADCOM NVRAM DRIVER
   M:    Rafał Miłecki <zajec5@gmail.com>
- -L:    linux-mips@linux-mips.org
+ +L:    linux-mips@vger.kernel.org
   S:    Maintained
   F:    drivers/firmware/broadcom/*
   
@@@ -3297,16 -3212,11 +3297,16 @@@ S:   Maintaine
   F:    sound/pci/oxygen/
   
   C-SKY ARCHITECTURE
- -M:    Guo Ren <ren_guo@c-sky.com>
+ +M:    Guo Ren <guoren@kernel.org>
   T:    git https://github.com/c-sky/csky-linux.git
   S:    Supported
   F:    arch/csky/
   F:    Documentation/devicetree/bindings/csky/
+ +F:    drivers/irqchip/irq-csky-*
+ +F:    Documentation/devicetree/bindings/interrupt-controller/csky,*
+ +F:    drivers/clocksource/timer-gx6605s.c
+ +F:    drivers/clocksource/timer-mp-csky.c
+ +F:    Documentation/devicetree/bindings/timer/csky,*
   K:    csky
   N:    csky
   
@@@ -3366,12 -3276,6 +3366,12 @@@ F:    include/uapi/linux/caif
   F:    include/net/caif/
   F:    net/caif/
   
+ +CAKE QDISC
+ +M:    Toke Høiland-Jørgensen <toke@toke.dk>
+ +L:    cake@lists.bufferbloat.net (moderated for non-subscribers)
+ +S:    Maintained
+ +F:    net/sched/sch_cake.c
+ +
   CALGARY x86-64 IOMMU
   M:    Muli Ben-Yehuda <mulix@mulix.org>
   M:    Jon Mason <jdmason@kudzu.us>
@@@ -3484,7 -3388,6 +3484,7 @@@ F:      include/linux/spi/cc2520.
   F:    Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
   
   CCREE ARM TRUSTZONE CRYPTOCELL REE DRIVER
+ +M:    Yael Chemla <yael.chemla@foss.arm.com>
   M:    Gilad Ben-Yossef <gilad@benyossef.com>
   L:    linux-crypto@vger.kernel.org
   S:    Supported
@@@ -3688,8 -3591,6 +3688,8 @@@ F:      drivers/net/ethernet/cisco/enic
   
   CISCO VIC LOW LATENCY NIC DRIVER
   M:    Christian Benvenuti <benve@cisco.com>
+ +M:    Nelson Escobar <neescoba@cisco.com>
+ +M:    Parvi Kaustubhi <pkaustub@cisco.com>
   S:    Supported
   F:    drivers/infiniband/hw/usnic/
   
@@@ -3703,10 -3604,8 +3703,10 @@@ W:    https://github.com/CirrusLogic/linux
   S:    Supported
   F:    Documentation/devicetree/bindings/mfd/madera.txt
   F:    Documentation/devicetree/bindings/pinctrl/cirrus,madera-pinctrl.txt
+ +F:    include/linux/irqchip/irq-madera*
   F:    include/linux/mfd/madera/*
   F:    drivers/gpio/gpio-madera*
+ +F:    drivers/irqchip/irq-madera*
   F:    drivers/mfd/madera*
   F:    drivers/mfd/cs47l*
   F:    drivers/pinctrl/cirrus/*
@@@ -4014,20 -3913,13 +4014,20 @@@ T:   git git://linuxtv.org/media_tree.gi
   W:    http://linuxtv.org
   S:    Odd Fixes
   F:    drivers/media/i2c/cs3308.c
- -F:    drivers/media/i2c/cs3308.h
   
   CS5535 Audio ALSA driver
   M:    Jaya Kumar <jayakumar.alsa@gmail.com>
   S:    Maintained
   F:    sound/pci/cs5535audio/
   
+ +CSI DRIVERS FOR ALLWINNER V3s
+ +M:    Yong Deng <yong.deng@magewell.com>
+ +L:    linux-media@vger.kernel.org
+ +T:    git git://linuxtv.org/media_tree.git
+ +S:    Maintained
+ +F:    drivers/media/platform/sunxi/sun6i-csi/
+ +F:    Documentation/devicetree/bindings/media/sun6i-csi.txt
+ +
   CW1200 WLAN driver
   M:    Solomon Peachy <pizza@shaftnet.org>
   S:    Maintained
@@@ -4052,7 -3944,7 +4052,7 @@@ T:      git git://linuxtv.org/media_tree.gi
   W:    https://linuxtv.org
   S:    Maintained
   F:    drivers/media/common/cx2341x*
- -F:    include/media/cx2341x*
+ +F:    include/media/drv-intf/cx2341x.h
   
   CX24120 MEDIA DRIVER
   M:    Jemma Denson <jdenson@gmail.com>
@@@ -4083,7 -3975,7 +4083,7 @@@ S:      Maintaine
   F:    drivers/media/dvb-frontends/cxd2820r*
   
   CXGB3 ETHERNET DRIVER (CXGB3)
- -M:    Santosh Raspatur <santosh@chelsio.com>
+ +M:    Arjun Vynipadath <arjun@chelsio.com>
   L:    netdev@vger.kernel.org
   W:    http://www.chelsio.com
   S:    Supported
@@@ -4112,7 -4004,7 +4112,7 @@@ S:      Supporte
   F:    drivers/crypto/chelsio
   
   CXGB4 ETHERNET DRIVER (CXGB4)
- -M:    Ganesh Goudar <ganeshgr@chelsio.com>
+ +M:    Arjun Vynipadath <arjun@chelsio.com>
   L:    netdev@vger.kernel.org
   W:    http://www.chelsio.com
   S:    Supported
@@@ -4141,7 -4033,7 +4141,7 @@@ S:      Supporte
   F:    drivers/net/ethernet/chelsio/cxgb4vf/
   
   CXL (IBM Coherent Accelerator Processor Interface CAPI) DRIVER
- -M:    Frederic Barrat <fbarrat@linux.vnet.ibm.com>
+ +M:    Frederic Barrat <fbarrat@linux.ibm.com>
   M:    Andrew Donnellan <andrew.donnellan@au1.ibm.com>
   L:    linuxppc-dev@lists.ozlabs.org
   S:    Supported
@@@ -4153,9 -4045,9 +4153,9 @@@ F:      Documentation/powerpc/cxl.tx
   F:    Documentation/ABI/testing/sysfs-class-cxl
   
   CXLFLASH (IBM Coherent Accelerator Processor Interface CAPI Flash) SCSI DRIVER
- -M:    Manoj N. Kumar <manoj@linux.vnet.ibm.com>
- -M:    Matthew R. Ochs <mrochs@linux.vnet.ibm.com>
- -M:    Uma Krishnan <ukrishn@linux.vnet.ibm.com>
+ +M:    Manoj N. Kumar <manoj@linux.ibm.com>
+ +M:    Matthew R. Ochs <mrochs@linux.ibm.com>
+ +M:    Uma Krishnan <ukrishn@linux.ibm.com>
   L:    linux-scsi@vger.kernel.org
   S:    Supported
   F:    drivers/scsi/cxlflash/
@@@ -4227,7 -4119,7 +4227,7 @@@ F:      net/ax25/sysctl_net_ax25.
   DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
   L:    netdev@vger.kernel.org
   S:    Orphan
- -F:    Documentation/networking/dmfe.txt
+ +F:    Documentation/networking/device_drivers/dec/dmfe.txt
   F:    drivers/net/ethernet/dec/tulip/dmfe.c
   
   DC390/AM53C974 SCSI driver
@@@ -4266,7 -4158,7 +4266,7 @@@ F:      net/decnet
   
   DECSTATION PLATFORM SUPPORT
   M:    "Maciej W. Rozycki" <macro@linux-mips.org>
- -L:    linux-mips@linux-mips.org
+ +L:    linux-mips@vger.kernel.org
   W:    http://www.linux-mips.org/wiki/DECstation
   S:    Maintained
   F:    arch/mips/dec/
@@@ -4763,13 -4655,6 +4763,13 @@@ S:    Maintaine
   F:    drivers/gpu/drm/tinydrm/ili9225.c
   F:    Documentation/devicetree/bindings/display/ilitek,ili9225.txt
   
+ +DRM DRIVER FOR HX8357D PANELS
+ +M:    Eric Anholt <eric@anholt.net>
+ +T:    git git://anongit.freedesktop.org/drm/drm-misc
+ +S:    Maintained
+ +F:    drivers/gpu/drm/tinydrm/hx8357d.c
+ +F:    Documentation/devicetree/bindings/display/himax,hx8357d.txt
+ +
   DRM DRIVER FOR INTEL I810 VIDEO CARDS
   S:    Orphan / Obsolete
   F:    drivers/gpu/drm/i810/
@@@ -4811,12 -4696,6 +4811,12 @@@ S:    Supporte
   F:    drivers/gpu/drm/nouveau/
   F:    include/uapi/drm/nouveau_drm.h
   
+ +DRM DRIVER FOR OLIMEX LCD-OLINUXINO PANELS
+ +M:    Stefan Mavrodiev <stefan@olimex.com>
+ +S:    Maintained
+ +F:    drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
+ +F:    Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino.txt
+ +
   DRM DRIVER FOR PERVASIVE DISPLAYS REPAPER PANELS
   M:    Noralf Trønnes <noralf@tronnes.org>
   S:    Maintained
@@@ -4882,8 -4761,10 +4882,8 @@@ T:     git git://anongit.freedesktop.org/dr
   
   DRM DRIVER FOR VMWARE VIRTUAL GPU
   M:    "VMware Graphics" <linux-graphics-maintainer@vmware.com>
- -M:    Sinclair Yeh <syeh@vmware.com>
   M:    Thomas Hellstrom <thellstrom@vmware.com>
   L:    dri-devel@lists.freedesktop.org
- -T:    git git://people.freedesktop.org/~syeh/repos_linux
   T:    git git://people.freedesktop.org/~thomash/linux
   S:    Supported
   F:    drivers/gpu/drm/vmwgfx/
@@@ -4891,7 -4772,6 +4891,7 @@@ F:      include/uapi/drm/vmwgfx_drm.
   
   DRM DRIVERS
   M:    David Airlie <airlied@linux.ie>
+ +M:    Daniel Vetter <daniel@ffwll.ch>
   L:    dri-devel@lists.freedesktop.org
   T:    git git://anongit.freedesktop.org/drm/drm
   B:    https://bugs.freedesktop.org/
@@@ -4941,7 -4821,7 +4941,7 @@@ F:      Documentation/gpu/meson.rs
   T:    git git://anongit.freedesktop.org/drm/drm-misc
   
   DRM DRIVERS FOR ATMEL HLCDC
- -M:    Boris Brezillon <boris.brezillon@bootlin.com>
+ +M:    Boris Brezillon <bbrezillon@kernel.org>
   L:    dri-devel@lists.freedesktop.org
   S:    Supported
   F:    drivers/gpu/drm/atmel-hlcdc/
@@@ -5369,7 -5249,7 +5369,7 @@@ EDAC-CAVIUM OCTEO
   M:    Ralf Baechle <ralf@linux-mips.org>
   M:    David Daney <david.daney@cavium.com>
   L:    linux-edac@vger.kernel.org
- -L:    linux-mips@linux-mips.org
+ +L:    linux-mips@vger.kernel.org
   S:    Supported
   F:    drivers/edac/octeon_edac*
   
@@@ -5450,6 -5330,7 +5450,6 @@@ S:      Maintaine
   F:    drivers/edac/i82443bxgx_edac.c
   
   EDAC-I82975X
- -M:    Ranganathan Desikan <ravi@jetztechnologies.com>
   M:    "Arvind R." <arvino55@gmail.com>
   L:    linux-edac@vger.kernel.org
   S:    Maintained
@@@ -5547,7 -5428,7 +5547,7 @@@ S:      Orpha
   F:    fs/efs/
   
   EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
- -M:    Douglas Miller <dougmill@linux.vnet.ibm.com>
+ +M:    Douglas Miller <dougmill@linux.ibm.com>
   L:    netdev@vger.kernel.org
   S:    Maintained
   F:    drivers/net/ethernet/ibm/ehea/
@@@ -5647,7 -5528,6 +5647,7 @@@ F:      net/bridge
   ETHERNET PHY LIBRARY
   M:    Andrew Lunn <andrew@lunn.ch>
   M:    Florian Fainelli <f.fainelli@gmail.com>
+ +M:    Heiner Kallweit <hkallweit1@gmail.com>
   L:    netdev@vger.kernel.org
   S:    Maintained
   F:    Documentation/ABI/testing/sysfs-bus-mdio
@@@ -5661,7 -5541,6 +5661,7 @@@ F:      include/linux/of_net.
   F:    include/linux/phy.h
   F:    include/linux/phy_fixed.h
   F:    include/linux/platform_data/mdio-bcm-unimac.h
+ +F:    include/linux/platform_data/mdio-gpio.h
   F:    include/trace/events/mdio.h
   F:    include/uapi/linux/mdio.h
   F:    include/uapi/linux/mii.h
@@@ -5686,7 -5565,7 +5686,7 @@@ F:      Documentation/filesystems/ext4/ext4.
   F:    fs/ext4/
   
   Extended Verification Module (EVM)
- -M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
+ +M:    Mimi Zohar <zohar@linux.ibm.com>
   L:    linux-integrity@vger.kernel.org
   S:    Supported
   F:    security/integrity/evm/
@@@ -5887,7 -5766,7 +5887,7 @@@ F:      include/uapi/linux/firewire*.
   F:    tools/firewire/
   
   FIRMWARE LOADER (request_firmware)
- -M:    Luis R. Rodriguez <mcgrof@kernel.org>
+ +M:    Luis Chamberlain <mcgrof@kernel.org>
   L:    linux-kernel@vger.kernel.org
   S:    Maintained
   F:    Documentation/firmware_class/
@@@ -5896,7 -5775,7 +5896,7 @@@ F:      include/linux/firmware.
   
   FLASH ADAPTER DRIVER (IBM Flash Adapter 900GB Full Height PCI Flash Card)
   M:    Joshua Morris <josh.h.morris@us.ibm.com>
- -M:    Philip Kelleher <pjk1939@linux.vnet.ibm.com>
+ +M:    Philip Kelleher <pjk1939@linux.ibm.com>
   S:    Maintained
   F:    drivers/block/rsxx/
   
@@@ -6163,7 -6042,7 +6163,7 @@@ F:      include/linux/fscrypt*.
   F:    Documentation/filesystems/fscrypt.rst
   
   FSI-ATTACHED I2C DRIVER
- -M:    Eddie James <eajames@linux.vnet.ibm.com>
+ +M:    Eddie James <eajames@linux.ibm.com>
   L:    linux-i2c@vger.kernel.org
   L:    openbmc@lists.ozlabs.org (moderated for non-subscribers)
   S:    Maintained
@@@ -6339,7 -6218,8 +6339,7 @@@ S:      Supporte
   F:    drivers/uio/uio_pci_generic.c
   
   GENWQE (IBM Generic Workqueue Card)
- -M:    Frank Haverkamp <haver@linux.vnet.ibm.com>
- -M:    Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
+ +M:    Frank Haverkamp <haver@linux.ibm.com>
   S:    Supported
   F:    drivers/misc/genwqe/
   
@@@ -6370,7 -6250,6 +6370,7 @@@ F:      include/uapi/linux/gigaset_dev.
   
   GNSS SUBSYSTEM
   M:    Johan Hovold <johan@kernel.org>
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git
   S:    Maintained
   F:    Documentation/ABI/testing/sysfs-class-gnss
   F:    Documentation/devicetree/bindings/gnss/
@@@ -6412,6 -6291,7 +6412,6 @@@ F:      drivers/media/rc/gpio-ir-tx.
   
   GPIO MOCKUP DRIVER
   M:    Bamvor Jian Zhang <bamv2005@gmail.com>
- -R:    Bartosz Golaszewski <brgl@bgdev.pl>
   L:    linux-gpio@vger.kernel.org
   S:    Maintained
   F:    drivers/gpio/gpio-mockup.c
@@@ -6419,7 -6299,6 +6419,7 @@@ F:      tools/testing/selftests/gpio
   
   GPIO SUBSYSTEM
   M:    Linus Walleij <linus.walleij@linaro.org>
+ +M:    Bartosz Golaszewski <bgolaszewski@baylibre.com>
   L:    linux-gpio@vger.kernel.org
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
   S:    Maintained
@@@ -6948,11 -6827,9 +6948,11 @@@ Hyper-V CORE AND DRIVER
   M:    "K. Y. Srinivasan" <kys@microsoft.com>
   M:    Haiyang Zhang <haiyangz@microsoft.com>
   M:    Stephen Hemminger <sthemmin@microsoft.com>
+ +M:    Sasha Levin <sashal@kernel.org>
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
   L:    devel@linuxdriverproject.org
- -S:    Maintained
- -F:    Documentation/networking/netvsc.txt
+ +S:    Supported
+ +F:    Documentation/networking/device_drivers/microsoft/netvsc.txt
   F:    arch/x86/include/asm/mshyperv.h
   F:    arch/x86/include/asm/trace/hyperv.h
   F:    arch/x86/include/asm/hyperv-tlfs.h
@@@ -7112,24 -6989,6 +7112,24 @@@ L:    linux-i2c@vger.kernel.or
   S:    Maintained
   F:    drivers/i2c/i2c-stub.c
   
+ +I3C SUBSYSTEM
+ +M:    Boris Brezillon <bbrezillon@kernel.org>
+ +L:    linux-i3c@lists.infradead.org
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git
+ +S:    Maintained
+ +F:    Documentation/ABI/testing/sysfs-bus-i3c
+ +F:    Documentation/devicetree/bindings/i3c/
+ +F:    Documentation/driver-api/i3c
+ +F:    drivers/i3c/
+ +F:    include/linux/i3c/
+ +F:    include/dt-bindings/i3c/
+ +
+ +I3C DRIVER FOR SYNOPSYS DESIGNWARE
+ +M:    Vitor Soares <vitor.soares@synopsys.com>
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.txt
+ +F:    drivers/i3c/master/dw*
+ +
   IA64 (Itanium) PLATFORM
   M:    Tony Luck <tony.luck@intel.com>
   M:    Fenghua Yu <fenghua.yu@intel.com>
@@@ -7149,9 -7008,8 +7149,9 @@@ F:      crypto/842.
   F:    lib/842/
   
   IBM Power in-Nest Crypto Acceleration
- -M:    Leonidas S. Barbosa <leosilva@linux.vnet.ibm.com>
- -M:    Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>
+ +M:    Breno Leitão <leitao@debian.org>
+ +M:    Nayna Jain <nayna@linux.ibm.com>
+ +M:    Paulo Flabiano Smorigo <pfsmorigo@gmail.com>
   L:    linux-crypto@vger.kernel.org
   S:    Supported
   F:    drivers/crypto/nx/Makefile
@@@ -7168,8 -7026,8 +7168,8 @@@ S:      Supporte
   F:    drivers/scsi/ipr.*
   
   IBM Power SRIOV Virtual NIC Device Driver
- -M:    Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
- -M:    John Allen <jallen@linux.vnet.ibm.com>
+ +M:    Thomas Falcon <tlfalcon@linux.ibm.com>
+ +M:    John Allen <jallen@linux.ibm.com>
   L:    netdev@vger.kernel.org
   S:    Supported
   F:    drivers/net/ethernet/ibm/ibmvnic.*
@@@ -7184,40 -7042,41 +7184,40 @@@ F:   arch/powerpc/include/asm/vas.
   F:    arch/powerpc/include/uapi/asm/vas.h
   
   IBM Power Virtual Ethernet Device Driver
- -M:    Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
+ +M:    Thomas Falcon <tlfalcon@linux.ibm.com>
   L:    netdev@vger.kernel.org
   S:    Supported
   F:    drivers/net/ethernet/ibm/ibmveth.*
   
   IBM Power Virtual FC Device Drivers
- -M:    Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
+ +M:    Tyrel Datwyler <tyreld@linux.ibm.com>
   L:    linux-scsi@vger.kernel.org
   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>
+ +M:    Steven Royer <seroyer@linux.ibm.com>
   S:    Supported
   F:    drivers/misc/ibmvmc.*
   
   IBM Power Virtual SCSI Device Drivers
- -M:    Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
+ +M:    Tyrel Datwyler <tyreld@linux.ibm.com>
   L:    linux-scsi@vger.kernel.org
   S:    Supported
   F:    drivers/scsi/ibmvscsi/ibmvscsi*
   F:    include/scsi/viosrp.h
   
   IBM Power Virtual SCSI Device Target Driver
- -M:    Bryant G. Ly <bryantly@linux.vnet.ibm.com>
- -M:    Michael Cyr <mikecyr@linux.vnet.ibm.com>
+ +M:    Michael Cyr <mikecyr@linux.ibm.com>
   L:    linux-scsi@vger.kernel.org
   L:    target-devel@vger.kernel.org
   S:    Supported
   F:    drivers/scsi/ibmvscsi_tgt/
   
   IBM Power VMX Cryptographic instructions
- -M:    Leonidas S. Barbosa <leosilva@linux.vnet.ibm.com>
- -M:    Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>
+ +M:    Breno Leitão <leitao@debian.org>
+ +M:    Nayna Jain <nayna@linux.ibm.com>
+ +M:    Paulo Flabiano Smorigo <pfsmorigo@gmail.com>
   L:    linux-crypto@vger.kernel.org
   S:    Supported
   F:    drivers/crypto/vmx/Makefile
@@@ -7494,7 -7353,7 +7494,7 @@@ S:      Maintaine
   L:    linux-crypto@vger.kernel.org
   
   INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
- -M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
+ +M:    Mimi Zohar <zohar@linux.ibm.com>
   M:    Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
   L:    linux-integrity@vger.kernel.org
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
@@@ -7554,18 -7413,18 +7554,18 @@@ 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.rst
- -F:    Documentation/networking/e1000.rst
- -F:    Documentation/networking/e1000e.rst
- -F:    Documentation/networking/fm10k.rst
- -F:    Documentation/networking/igb.rst
- -F:    Documentation/networking/igbvf.rst
- -F:    Documentation/networking/ixgb.rst
- -F:    Documentation/networking/ixgbe.rst
- -F:    Documentation/networking/ixgbevf.rst
- -F:    Documentation/networking/i40e.rst
- -F:    Documentation/networking/iavf.rst
- -F:    Documentation/networking/ice.rst
+ +F:    Documentation/networking/device_drivers/intel/e100.rst
+ +F:    Documentation/networking/device_drivers/intel/e1000.rst
+ +F:    Documentation/networking/device_drivers/intel/e1000e.rst
+ +F:    Documentation/networking/device_drivers/intel/fm10k.rst
+ +F:    Documentation/networking/device_drivers/intel/igb.rst
+ +F:    Documentation/networking/device_drivers/intel/igbvf.rst
+ +F:    Documentation/networking/device_drivers/intel/ixgb.rst
+ +F:    Documentation/networking/device_drivers/intel/ixgbe.rst
+ +F:    Documentation/networking/device_drivers/intel/ixgbevf.rst
+ +F:    Documentation/networking/device_drivers/intel/i40e.rst
+ +F:    Documentation/networking/device_drivers/intel/iavf.rst
+ +F:    Documentation/networking/device_drivers/intel/ice.rst
   F:    drivers/net/ethernet/intel/
   F:    drivers/net/ethernet/intel/*/
   F:    include/linux/avf/virtchnl.h
@@@ -7577,20 -7436,6 +7577,20 @@@ S:    Maintaine
   F:    Documentation/fb/intelfb.txt
   F:    drivers/video/fbdev/intelfb/
   
+ +INTEL GPIO DRIVERS
+ +M:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+ +L:    linux-gpio@vger.kernel.org
+ +S:    Maintained
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
+ +F:    drivers/gpio/gpio-ich.c
+ +F:    drivers/gpio/gpio-intel-mid.c
+ +F:    drivers/gpio/gpio-lynxpoint.c
+ +F:    drivers/gpio/gpio-merrifield.c
+ +F:    drivers/gpio/gpio-ml-ioh.c
+ +F:    drivers/gpio/gpio-pch.c
+ +F:    drivers/gpio/gpio-sch.c
+ +F:    drivers/gpio/gpio-sodaville.c
+ +
   INTEL GVT-g DRIVERS (Intel GPU Virtualization)
   M:    Zhenyu Wang <zhenyuw@linux.intel.com>
   M:    Zhi Wang <zhi.a.wang@intel.com>
@@@ -7601,6 -7446,12 +7601,6 @@@ T:     git https://github.com/intel/gvt-lin
   S:    Supported
   F:    drivers/gpu/drm/i915/gvt/
   
- -INTEL PMIC GPIO DRIVER
- -R:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
- -S:    Maintained
- -F:    drivers/gpio/gpio-*cove.c
- -F:    drivers/gpio/gpio-msic.c
- -
   INTEL HID EVENT DRIVER
   M:    Alex Hung <alex.hung@canonical.com>
   L:    platform-driver-x86@vger.kernel.org
@@@ -7655,14 -7506,6 +7655,14 @@@ S:    Maintaine
   F:    drivers/media/pci/intel/ipu3/
   F:    Documentation/media/uapi/v4l/pixfmt-srggb10-ipu3.rst
   
+ +INTEL IPU3 CSI-2 IMGU DRIVER
+ +M:    Sakari Ailus <sakari.ailus@linux.intel.com>
+ +L:    linux-media@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/staging/media/ipu3/
+ +F:    Documentation/media/uapi/v4l/pixfmt-meta-intel-ipu3.rst
+ +F:    Documentation/media/v4l-drivers/ipu3.rst
+ +
   INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
   M:    Krzysztof Halasa <khalasa@piap.pl>
   S:    Maintained
@@@ -7696,6 -7539,12 +7696,6 @@@ W:     https://01.org/linux-acp
   S:    Supported
   F:    drivers/platform/x86/intel_menlow.c
   
- -INTEL MERRIFIELD GPIO DRIVER
- -M:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
- -L:    linux-gpio@vger.kernel.org
- -S:    Maintained
- -F:    drivers/gpio/gpio-merrifield.c
- -
   INTEL MIC DRIVERS (mic)
   M:    Sudeep Dutt <sudeep.dutt@intel.com>
   M:    Ashutosh Dixit <ashutosh.dixit@intel.com>
@@@ -7728,13 -7577,6 +7728,13 @@@ F:    drivers/platform/x86/intel_punit_ipc
   F:    arch/x86/include/asm/intel_pmc_ipc.h
   F:    arch/x86/include/asm/intel_punit_ipc.h
   
+ +INTEL PMIC GPIO DRIVERS
+ +M:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+ +S:    Maintained
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
+ +F:    drivers/gpio/gpio-*cove.c
+ +F:    drivers/gpio/gpio-msic.c
+ +
   INTEL MULTIFUNCTION PMIC DEVICE DRIVERS
   R:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
   S:    Maintained
@@@ -7747,8 -7589,8 +7747,8 @@@ INTEL PRO/WIRELESS 2100, 2200BG, 2915AB
   M:    Stanislav Yakovlev <stas.yakovlev@gmail.com>
   L:    linux-wireless@vger.kernel.org
   S:    Maintained
- -F:    Documentation/networking/README.ipw2100
- -F:    Documentation/networking/README.ipw2200
+ +F:    Documentation/networking/device_drivers/intel/ipw2100.txt
+ +F:    Documentation/networking/device_drivers/intel/ipw2200.txt
   F:    drivers/net/wireless/intel/ipw2x00/
   
   INTEL PSTATE DRIVER
@@@ -7843,7 -7685,7 +7843,7 @@@ F:      Documentation/devicetree/bindings/ii
   
   IOC3 ETHERNET DRIVER
   M:    Ralf Baechle <ralf@linux-mips.org>
- -L:    linux-mips@linux-mips.org
+ +L:    linux-mips@vger.kernel.org
   S:    Maintained
   F:    drivers/net/ethernet/sgi/ioc3-eth.c
   
@@@ -8008,6 -7850,13 +8008,6 @@@ F:     include/linux/isdn
   F:    include/uapi/linux/isdn.h
   F:    include/uapi/linux/isdn/
   
- -ISDN SUBSYSTEM (Eicon active card driver)
- -M:    Armin Schindler <mac@melware.de>
- -L:    isdn4linux@listserv.isdn4linux.de (subscribers-only)
- -W:    http://www.melware.de
- -S:    Maintained
- -F:    drivers/isdn/hardware/eicon/
- -
   IT87 HARDWARE MONITORING DRIVER
   M:    Jean Delvare <jdelvare@suse.com>
   L:    linux-hwmon@vger.kernel.org
@@@ -8096,8 -7945,9 +8096,8 @@@ S:      Maintaine
   F:    drivers/media/platform/rcar_jpu.c
   
   JSM Neo PCI based serial card
- -M:    Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
   L:    linux-serial@vger.kernel.org
- -S:    Maintained
+ +S:    Orphan
   F:    drivers/tty/serial/jsm/
   
   K10TEMP HARDWARE MONITORING DRIVER
@@@ -8206,7 -8056,7 +8206,7 @@@ F:      tools/testing/selftests
   F:    Documentation/dev-tools/kselftest*
   
   KERNEL USERMODE HELPER
- -M:    "Luis R. Rodriguez" <mcgrof@kernel.org>
+ +M:    Luis Chamberlain <mcgrof@kernel.org>
   L:    linux-kernel@vger.kernel.org
   S:    Maintained
   F:    kernel/umh.c
@@@ -8263,7 -8113,7 +8263,7 @@@ F:      arch/arm64/kvm
   
   KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
   M:    James Hogan <jhogan@kernel.org>
- -L:    linux-mips@linux-mips.org
+ +L:    linux-mips@vger.kernel.org
   S:    Supported
   F:    arch/mips/include/uapi/asm/kvm*
   F:    arch/mips/include/asm/kvm*
@@@ -8303,7 -8153,6 +8303,7 @@@ W:      http://www.linux-kvm.or
   T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
   S:    Supported
   F:    arch/x86/kvm/
+ +F:    arch/x86/kvm/*/
   F:    arch/x86/include/uapi/asm/kvm*
   F:    arch/x86/include/asm/kvm*
   F:    arch/x86/include/asm/pvclock-abi.h
@@@ -8328,7 -8177,7 +8328,7 @@@ F:      include/uapi/linux/kexec.
   F:    kernel/kexec*
   
   KEYS-ENCRYPTED
- -M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
+ +M:    Mimi Zohar <zohar@linux.ibm.com>
   L:    linux-integrity@vger.kernel.org
   L:    keyrings@vger.kernel.org
   S:    Supported
@@@ -8337,9 -8186,9 +8337,9 @@@ F:      include/keys/encrypted-type.
   F:    security/keys/encrypted-keys/
   
   KEYS-TRUSTED
- -M:    James Bottomley <jejb@linux.vnet.ibm.com>
+ +M:    James Bottomley <jejb@linux.ibm.com>
   M:      Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
- -M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
+ +M:    Mimi Zohar <zohar@linuxibm.com>
   L:    linux-integrity@vger.kernel.org
   L:    keyrings@vger.kernel.org
   S:    Supported
@@@ -8383,7 -8232,7 +8383,7 @@@ F:      mm/kmemleak.
   F:    mm/kmemleak-test.c
   
   KMOD KERNEL MODULE LOADER - USERMODE HELPER
- -M:    "Luis R. Rodriguez" <mcgrof@kernel.org>
+ +M:    Luis Chamberlain <mcgrof@kernel.org>
   L:    linux-kernel@vger.kernel.org
   S:    Maintained
   F:    kernel/kmod.c
@@@ -8392,7 -8241,7 +8392,7 @@@ F:      lib/test_kmod.
   F:    tools/testing/selftests/kmod/
   
   KPROBES
- -M:    Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
+ +M:    Naveen N. Rao <naveen.n.rao@linux.ibm.com>
   M:    Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
   M:    "David S. Miller" <davem@davemloft.net>
   M:    Masami Hiramatsu <mhiramat@kernel.org>
@@@ -8437,7 -8286,7 +8437,7 @@@ F:      drivers/net/dsa/lantiq_gswip.
   
   LANTIQ MIPS ARCHITECTURE
   M:    John Crispin <john@phrozen.org>
- -L:    linux-mips@linux-mips.org
+ +L:    linux-mips@vger.kernel.org
   S:    Maintained
   F:    arch/mips/lantiq
   F:    drivers/soc/lantiq
@@@ -8748,7 -8597,7 +8748,7 @@@ M:      Nicholas Piggin <npiggin@gmail.com
   M:    David Howells <dhowells@redhat.com>
   M:    Jade Alglave <j.alglave@ucl.ac.uk>
   M:    Luc Maranget <luc.maranget@inria.fr>
- -M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+ +M:    "Paul E. McKenney" <paulmck@linux.ibm.com>
   R:    Akira Yokosawa <akiyks@gmail.com>
   R:    Daniel Lustig <dlustig@nvidia.com>
   L:    linux-kernel@vger.kernel.org
@@@ -9000,13 -8849,13 +9000,13 @@@ S:   Maintaine
   
   MARDUK (CREATOR CI40) DEVICE TREE SUPPORT
   M:    Rahul Bedarkar <rahulbedarkar89@gmail.com>
- -L:    linux-mips@linux-mips.org
+ +L:    linux-mips@vger.kernel.org
   S:    Maintained
   F:    arch/mips/boot/dts/img/pistachio_marduk.dts
   
   MARVELL 88E6XXX ETHERNET SWITCH FABRIC DRIVER
   M:    Andrew Lunn <andrew@lunn.ch>
- -M:    Vivien Didelot <vivien.didelot@savoirfairelinux.com>
+ +M:    Vivien Didelot <vivien.didelot@gmail.com>
   L:    netdev@vger.kernel.org
   S:    Maintained
   F:    drivers/net/dsa/mv88e6xxx/
@@@ -9023,7 -8872,7 +9023,7 @@@ F:      include/uapi/drm/armada_drm.
   F:    Documentation/devicetree/bindings/display/armada/
   
   MARVELL CRYPTO DRIVER
- -M:    Boris Brezillon <boris.brezillon@bootlin.com>
+ +M:    Boris Brezillon <bbrezillon@kernel.org>
   M:    Arnaud Ebalard <arno@natisbad.org>
   F:    drivers/crypto/marvell/
   S:    Maintained
@@@ -9511,13 -9360,6 +9511,13 @@@ F:    drivers/media/platform/mtk-vpu
   F:    Documentation/devicetree/bindings/media/mediatek-vcodec.txt
   F:    Documentation/devicetree/bindings/media/mediatek-vpu.txt
   
+ +MEDIATEK MT76 WIRELESS LAN DRIVER
+ +M:    Felix Fietkau <nbd@nbd.name>
+ +M:    Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
+ +L:    linux-wireless@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/net/wireless/mediatek/mt76/
+ +
   MEDIATEK MT7601U WIRELESS LAN DRIVER
   M:    Jakub Kicinski <kubakici@wp.pl>
   L:    linux-wireless@vger.kernel.org
@@@ -9713,7 -9555,7 +9713,7 @@@ F:      drivers/platform/x86/mlx-platform.
   
   MEMBARRIER SUPPORT
   M:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- -M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+ +M:    "Paul E. McKenney" <paulmck@linux.ibm.com>
   L:    linux-kernel@vger.kernel.org
   S:    Supported
   F:    kernel/sched/membarrier.c
@@@ -9734,7 -9576,7 +9734,7 @@@ F:      mm
   MEMORY TECHNOLOGY DEVICES (MTD)
   M:    David Woodhouse <dwmw2@infradead.org>
   M:    Brian Norris <computersforpeace@gmail.com>
- -M:    Boris Brezillon <boris.brezillon@bootlin.com>
+ +M:    Boris Brezillon <bbrezillon@kernel.org>
   M:    Marek Vasut <marek.vasut@gmail.com>
   M:    Richard Weinberger <richard@nod.at>
   L:    linux-mtd@lists.infradead.org
@@@ -9835,14 -9677,14 +9835,14 @@@ L:   linux-media@vger.kernel.or
   S:    Supported
   F:    drivers/media/platform/atmel/atmel-isc.c
   F:    drivers/media/platform/atmel/atmel-isc-regs.h
- -F:    devicetree/bindings/media/atmel-isc.txt
+ +F:    Documentation/devicetree/bindings/media/atmel-isc.txt
   
   MICROCHIP ISI DRIVER
   M:    Eugen Hristev <eugen.hristev@microchip.com>
   L:    linux-media@vger.kernel.org
   S:    Supported
   F:    drivers/media/platform/atmel/atmel-isi.c
- -F:    include/media/atmel-isi.h
+ +F:    drivers/media/platform/atmel/atmel-isi.h
   
   MICROCHIP AT91 USART MFD DRIVER
   M:    Radu Pirea <radu_nicolae.pirea@upb.ro>
@@@ -9888,13 -9730,6 +9888,13 @@@ M:    Ludovic Desroches <ludovic.desroches
   S:    Maintained
   F:    drivers/mmc/host/atmel-mci.c
   
+ +MICROCHIP MCP16502 PMIC DRIVER
+ +M:    Andrei Stefanescu <andrei.stefanescu@microchip.com>
+ +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/regulator/mcp16502-regulator.txt
+ +F:    drivers/regulator/mcp16502.c
+ +
   MICROCHIP MCP3911 ADC DRIVER
   M:    Marcus Folkesson <marcus.folkesson@gmail.com>
   M:    Kent Gustavsson <kent@minoris.se>
@@@ -9932,12 -9767,6 +9932,12 @@@ M:    Nicolas Ferre <nicolas.ferre@microch
   S:    Supported
   F:    drivers/power/reset/at91-sama5d2_shdwc.c
   
+ +MICROCHIP SAMA5D2-COMPATIBLE PIOBU GPIO
+ +M:    Andrei Stefanescu <andrei.stefanescu@microchip.com>
+ +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ +L:    linux-gpio@vger.kernel.org
+ +F:    drivers/gpio/gpio-sama5d2-piobu.c
+ +
   MICROCHIP SPI DRIVER
   M:    Nicolas Ferre <nicolas.ferre@microchip.com>
   S:    Supported
@@@ -9979,7 -9808,7 +9979,7 @@@ F:      drivers/dma/at_xdmac.
   
   MICROSEMI MIPS SOCS
   M:    Alexandre Belloni <alexandre.belloni@bootlin.com>
- -L:    linux-mips@linux-mips.org
+ +L:    linux-mips@vger.kernel.org
   S:    Maintained
   F:    arch/mips/generic/board-ocelot.c
   F:    arch/mips/configs/generic/board-ocelot.config
@@@ -10000,7 -9829,6 +10000,7 @@@ F:    Documentation/scsi/smartpqi.tx
   
   MICROSEMI ETHERNET SWITCH DRIVER
   M:    Alexandre Belloni <alexandre.belloni@bootlin.com>
+ +M:    Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
   L:    netdev@vger.kernel.org
   S:    Supported
   F:    drivers/net/ethernet/mscc/
@@@ -10020,7 -9848,7 +10020,7 @@@ MIP
   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
+ +L:    linux-mips@vger.kernel.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
@@@ -10033,7 -9861,7 +10033,7 @@@ F:    drivers/platform/mips
   
   MIPS BOSTON DEVELOPMENT BOARD
   M:    Paul Burton <paul.burton@mips.com>
- -L:    linux-mips@linux-mips.org
+ +L:    linux-mips@vger.kernel.org
   S:    Maintained
   F:    Documentation/devicetree/bindings/clock/img,boston-clock.txt
   F:    arch/mips/boot/dts/img/boston.dts
@@@ -10043,7 -9871,7 +10043,7 @@@ F:    include/dt-bindings/clock/boston-clo
   
   MIPS GENERIC PLATFORM
   M:    Paul Burton <paul.burton@mips.com>
- -L:    linux-mips@linux-mips.org
+ +L:    linux-mips@vger.kernel.org
   S:    Supported
   F:    Documentation/devicetree/bindings/power/mti,mips-cpc.txt
   F:    arch/mips/generic/
@@@ -10051,7 -9879,7 +10051,7 @@@ F:    arch/mips/tools/generic-board-config
   
   MIPS/LOONGSON1 ARCHITECTURE
   M:    Keguang Zhang <keguang.zhang@gmail.com>
- -L:    linux-mips@linux-mips.org
+ +L:    linux-mips@vger.kernel.org
   S:    Maintained
   F:    arch/mips/loongson32/
   F:    arch/mips/include/asm/mach-loongson32/
@@@ -10060,7 -9888,7 +10060,7 @@@ F:    drivers/*/*/*loongson1
   
   MIPS/LOONGSON2 ARCHITECTURE
   M:    Jiaxun Yang <jiaxun.yang@flygoat.com>
- -L:    linux-mips@linux-mips.org
+ +L:    linux-mips@vger.kernel.org
   S:    Maintained
   F:    arch/mips/loongson64/fuloong-2e/
   F:    arch/mips/loongson64/lemote-2f/
@@@ -10070,7 -9898,7 +10070,7 @@@ F:    drivers/*/*/*loongson2
   
   MIPS/LOONGSON3 ARCHITECTURE
   M:    Huacai Chen <chenhc@lemote.com>
- -L:    linux-mips@linux-mips.org
+ +L:    linux-mips@vger.kernel.org
   S:    Maintained
   F:    arch/mips/loongson64/
   F:    arch/mips/include/asm/mach-loongson64/
@@@ -10080,7 -9908,7 +10080,7 @@@ F:    drivers/*/*/*loongson3
   
   MIPS RINT INSTRUCTION EMULATION
   M:    Aleksandar Markovic <aleksandar.markovic@mips.com>
- -L:    linux-mips@linux-mips.org
+ +L:    linux-mips@vger.kernel.org
   S:    Supported
   F:    arch/mips/math-emu/sp_rint.c
   F:    arch/mips/math-emu/dp_rint.c
@@@ -10094,9 -9922,12 +10094,9 @@@ S:   Odd Fixe
   F:    drivers/media/radio/radio-miropcm20*
   
   MMP SUPPORT
- -M:    Eric Miao <eric.y.miao@gmail.com>
- -M:    Haojian Zhuang <haojian.zhuang@gmail.com>
+ +R:    Lubomir Rintel <lkundrak@v3.sk>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
- -T:    git git://github.com/hzhuang1/linux.git
- -T:    git git://git.linaro.org/people/ycmiao/pxa-linux.git
- -S:    Maintained
+ +S:    Odd Fixes
   F:    arch/arm/boot/dts/mmp*
   F:    arch/arm/mach-mmp/
   
@@@ -10335,7 -10166,7 +10335,7 @@@ S:   Supporte
   F:    drivers/net/ethernet/myricom/myri10ge/
   
   NAND FLASH SUBSYSTEM
- -M:    Boris Brezillon <boris.brezillon@bootlin.com>
+ +M:    Boris Brezillon <bbrezillon@kernel.org>
   M:    Miquel Raynal <miquel.raynal@bootlin.com>
   R:    Richard Weinberger <richard@nod.at>
   L:    linux-mtd@lists.infradead.org
@@@ -10412,8 -10243,8 +10412,8 @@@ NETERION 10GbE DRIVERS (s2io/vxge
   M:    Jon Mason <jdmason@kudzu.us>
   L:    netdev@vger.kernel.org
   S:    Supported
- -F:    Documentation/networking/s2io.txt
- -F:    Documentation/networking/vxge.txt
+ +F:    Documentation/networking/device_drivers/neterion/s2io.txt
+ +F:    Documentation/networking/device_drivers/neterion/vxge.txt
   F:    drivers/net/ethernet/neterion/
   
   NETFILTER
@@@ -10502,7 -10333,7 +10502,7 @@@ F:   drivers/net/wireless
   
   NETWORKING [DSA]
   M:    Andrew Lunn <andrew@lunn.ch>
- -M:    Vivien Didelot <vivien.didelot@savoirfairelinux.com>
+ +M:    Vivien Didelot <vivien.didelot@gmail.com>
   M:    Florian Fainelli <f.fainelli@gmail.com>
   S:    Maintained
   F:    Documentation/devicetree/bindings/net/dsa/
@@@ -10855,14 -10686,6 +10855,14 @@@ L: linux-nfc@lists.01.org (moderated fo
   S:    Supported
   F:    drivers/nfc/nxp-nci
   
+ +OBJAGG
+ +M:    Jiri Pirko <jiri@mellanox.com>
+ +L:    netdev@vger.kernel.org
+ +S:    Supported
+ +F:    lib/objagg.c
+ +F:    lib/test_objagg.c
+ +F:    include/linux/objagg.h
+ +
   OBJTOOL
   M:    Josh Poimboeuf <jpoimboe@redhat.com>
   M:    Peter Zijlstra <peterz@infradead.org>
@@@ -10870,7 -10693,7 +10870,7 @@@ S:   Supporte
   F:    tools/objtool/
   
   OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
- -M:    Frederic Barrat <fbarrat@linux.vnet.ibm.com>
+ +M:    Frederic Barrat <fbarrat@linux.ibm.com>
   M:    Andrew Donnellan <andrew.donnellan@au1.ibm.com>
   L:    linuxppc-dev@lists.ozlabs.org
   S:    Supported
@@@ -10887,10 -10710,7 +10887,10 @@@ M: Jarkko Nikula <jarkko.nikula@bitmer.
   L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
   L:    linux-omap@vger.kernel.org
   S:    Maintained
- -F:    sound/soc/omap/
+ +F:    sound/soc/ti/omap*
+ +F:    sound/soc/ti/rx51.c
+ +F:    sound/soc/ti/n810.c
+ +F:    sound/soc/ti/sdma-pcm.*
   
   OMAP CLOCK FRAMEWORK SUPPORT
   M:    Paul Walmsley <paul@pwsan.com>
@@@ -10988,9 -10808,9 +10988,9 @@@ F:   drivers/media/platform/omap3isp
   F:    drivers/staging/media/omap4iss/
   
   OMAP MMC SUPPORT
- -M:    Jarkko Lavinen <jarkko.lavinen@nokia.com>
+ +M:    Aaro Koskinen <aaro.koskinen@iki.fi>
   L:    linux-omap@vger.kernel.org
- -S:    Maintained
+ +S:    Odd Fixes
   F:    drivers/mmc/host/omap.c
   
   OMAP POWER MANAGEMENT SUPPORT
@@@ -11073,7 -10893,7 +11073,7 @@@ F:   include/linux/platform_data/i2c-omap
   
   ONION OMEGA2+ BOARD
   M:    Harvey Hunt <harveyhuntnexus@gmail.com>
- -L:    linux-mips@linux-mips.org
+ +L:    linux-mips@vger.kernel.org
   S:    Maintained
   F:    arch/mips/boot/dts/ralink/omega2p.dts
   
@@@ -11925,7 -11745,6 +11925,7 @@@ F:   Documentation/devicetree/bindings/pi
   PIN CONTROLLER - INTEL
   M:    Mika Westerberg <mika.westerberg@linux.intel.com>
   M:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git
   S:    Maintained
   F:    drivers/pinctrl/intel/
   
@@@ -11982,7 -11801,7 +11982,7 @@@ F:   drivers/pinctrl/spear
   
   PISTACHIO SOC SUPPORT
   M:    James Hartley <james.hartley@sondrel.com>
- -L:    linux-mips@linux-mips.org
+ +L:    linux-mips@vger.kernel.org
   S:    Odd Fixes
   F:    arch/mips/pistachio/
   F:    arch/mips/include/asm/mach-pistachio/
@@@ -12162,7 -11981,7 +12162,7 @@@ F:   kernel/printk
   F:    include/linux/printk.h
   
   PRISM54 WIRELESS DRIVER
- -M:    "Luis R. Rodriguez" <mcgrof@gmail.com>
+ +M:    Luis Chamberlain <mcgrof@kernel.org>
   L:    linux-wireless@vger.kernel.org
   W:    http://wireless.kernel.org/en/users/Drivers/p54
   S:    Obsolete
@@@ -12176,10 -11995,9 +12176,10 @@@ S: Maintaine
   F:    fs/proc/
   F:    include/linux/proc_fs.h
   F:    tools/testing/selftests/proc/
+ +F:    Documentation/filesystems/proc.txt
   
   PROC SYSCTL
- -M:    "Luis R. Rodriguez" <mcgrof@kernel.org>
+ +M:    Luis Chamberlain <mcgrof@kernel.org>
   M:    Kees Cook <keescook@chromium.org>
   L:    linux-kernel@vger.kernel.org
   L:    linux-fsdevel@vger.kernel.org
@@@ -12426,7 -12244,7 +12426,7 @@@ QLOGIC QLA3XXX NETWORK DRIVE
   M:    Dept-GELinuxNICDev@cavium.com
   L:    netdev@vger.kernel.org
   S:    Supported
- -F:    Documentation/networking/LICENSE.qla3xxx
+ +F:    Documentation/networking/device_drivers/qlogic/LICENSE.qla3xxx
   F:    drivers/net/ethernet/qlogic/qla3xxx.*
   
   QLOGIC QLA4XXX iSCSI DRIVER
@@@ -12478,7 -12296,7 +12478,7 @@@ L:   linux-kernel@vger.kernel.or
   S:    Maintained
   F:    drivers/bus/fsl-mc/
   F:    Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
- -F:    Documentation/networking/dpaa2/overview.rst
+ +F:    Documentation/networking/device_drivers/freescale/dpaa2/overview.rst
   
   QT1010 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
@@@ -12506,7 -12324,7 +12506,7 @@@ S:   Supporte
   F:    drivers/net/wireless/ath/ath9k/
   
   QUALCOMM CAMERA SUBSYSTEM DRIVER
- -M:    Todor Tomov <todor.tomov@linaro.org>
+ +M:    Todor Tomov <todor.too@gmail.com>
   L:    linux-media@vger.kernel.org
   S:    Maintained
   F:    Documentation/devicetree/bindings/media/qcom,camss.txt
@@@ -12642,7 -12460,7 +12642,7 @@@ F:   drivers/media/usb/rainshadow-cec/
   
   RALINK MIPS ARCHITECTURE
   M:    John Crispin <john@phrozen.org>
- -L:    linux-mips@linux-mips.org
+ +L:    linux-mips@vger.kernel.org
   S:    Maintained
   F:    arch/mips/ralink
   
@@@ -12662,7 -12480,7 +12662,7 @@@ F:   drivers/block/brd.
   
   RANCHU VIRTUAL BOARD FOR MIPS
   M:    Miodrag Dinic <miodrag.dinic@mips.com>
- -L:    linux-mips@linux-mips.org
+ +L:    linux-mips@vger.kernel.org
   S:    Supported
   F:    arch/mips/generic/board-ranchu.c
   F:    arch/mips/configs/generic/board-ranchu.config
@@@ -12684,7 -12502,7 +12684,7 @@@ S:   Orpha
   F:    drivers/net/wireless/ray*
   
   RCUTORTURE TEST FRAMEWORK
- -M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+ +M:    "Paul E. McKenney" <paulmck@linux.ibm.com>
   M:    Josh Triplett <josh@joshtriplett.org>
   R:    Steven Rostedt <rostedt@goodmis.org>
   R:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@@@ -12726,17 -12544,16 +12726,17 @@@ M:        Fenghua Yu <fenghua.yu@intel.com
   M:    Reinette Chatre <reinette.chatre@intel.com>
   L:    linux-kernel@vger.kernel.org
   S:    Supported
- -F:    arch/x86/kernel/cpu/intel_rdt*
- -F:    arch/x86/include/asm/intel_rdt_sched.h
- -F:    Documentation/x86/intel_rdt*
+ +F:    arch/x86/kernel/cpu/resctrl/
+ +F:    arch/x86/include/asm/resctrl_sched.h
+ +F:    Documentation/x86/resctrl*
   
   READ-COPY UPDATE (RCU)
- -M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+ +M:    "Paul E. McKenney" <paulmck@linux.ibm.com>
   M:    Josh Triplett <josh@joshtriplett.org>
   R:    Steven Rostedt <rostedt@goodmis.org>
   R:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
   R:    Lai Jiangshan <jiangshanlai@gmail.com>
+ +R:    Joel Fernandes <joel@joelfernandes.org>
   L:    linux-kernel@vger.kernel.org
   W:    http://www.rdrop.com/users/paulmck/RCU/
   S:    Supported
@@@ -12872,7 -12689,7 +12872,7 @@@ F:   include/linux/reset-controller.
   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:    "Paul E. McKenney" <paulmck@linux.ibm.com>
   M:    Boqun Feng <boqun.feng@gmail.com>
   L:    linux-kernel@vger.kernel.org
   S:    Supported
@@@ -12940,13 -12757,6 +12940,13 @@@ S: Maintaine
   F:    drivers/media/platform/rockchip/rga/
   F:    Documentation/devicetree/bindings/media/rockchip-rga.txt
   
+ +ROCKCHIP VPU CODEC DRIVER
+ +M:    Ezequiel Garcia <ezequiel@collabora.com>
+ +L:    linux-media@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/staging/media/platform/rockchip/vpu/
+ +F:    Documentation/devicetree/bindings/media/rockchip-vpu.txt
+ +
   ROCKER DRIVER
   M:    Jiri Pirko <jiri@resnulli.us>
   L:    netdev@vger.kernel.org
@@@ -13196,7 -13006,7 +13196,7 @@@ T:   git git://linuxtv.org/media_tree.gi
   S:    Maintained
   F:    drivers/media/common/saa7146/
   F:    drivers/media/pci/saa7146/
- -F:    include/media/saa7146*
+ +F:    include/media/drv-intf/saa7146*
   
   SAMSUNG AUDIO (ASoC) DRIVERS
   M:    Krzysztof Kozlowski <krzk@kernel.org>
@@@ -13404,7 -13214,7 +13404,7 @@@ F:   drivers/scsi/sg.
   F:    include/scsi/sg.h
   
   SCSI SUBSYSTEM
- -M:    "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
+ +M:    "James E.J. Bottomley" <jejb@linux.ibm.com>
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
   M:    "Martin K. Petersen" <martin.petersen@oracle.com>
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
@@@ -13462,12 -13272,6 +13462,12 @@@ L: sdricohcs-devel@lists.sourceforge.ne
   S:    Maintained
   F:    drivers/mmc/host/sdricoh_cs.c
   
+ +SECO BOARDS CEC DRIVER
+ +M:    Ettore Chimenti <ek5.chimenti@gmail.com>
+ +S:    Maintained
+ +F:    drivers/media/platform/seco-cec/seco-cec.c
+ +F:    drivers/media/platform/seco-cec/seco-cec.h
+ +
   SECURE COMPUTING
   M:    Kees Cook <keescook@chromium.org>
   R:    Andy Lutomirski <luto@amacapital.net>
@@@ -13845,7 -13649,7 +13845,7 @@@ F:   mm/sl?b
   
   SLEEPABLE READ-COPY UPDATE (SRCU)
   M:    Lai Jiangshan <jiangshanlai@gmail.com>
- -M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+ +M:    "Paul E. McKenney" <paulmck@linux.ibm.com>
   M:    Josh Triplett <josh@joshtriplett.org>
   R:    Steven Rostedt <rostedt@goodmis.org>
   R:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
@@@ -14001,13 -13805,6 +14001,13 @@@ F: drivers/md/raid
   F:    include/linux/raid/
   F:    include/uapi/linux/raid/
   
+ +SOCIONEXT (SNI) AVE NETWORK DRIVER
+ +M:    Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
+ +L:    netdev@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/net/ethernet/socionext/sni_ave.c
+ +F:    Documentation/devicetree/bindings/net/socionext,uniphier-ave4.txt
+ +
   SOCIONEXT (SNI) NETSEC NETWORK DRIVER
   M:    Jassi Brar <jaswinder.singh@linaro.org>
   L:    netdev@vger.kernel.org
@@@ -14041,14 -13838,6 +14041,14 @@@ S: Maintaine
   F:    drivers/ssb/
   F:    include/linux/ssb/
   
+ +SONY IMX214 SENSOR DRIVER
+ +M:    Ricardo Ribalda <ricardo.ribalda@gmail.com>
+ +L:    linux-media@vger.kernel.org
+ +T:    git git://linuxtv.org/media_tree.git
+ +S:    Maintained
+ +F:    drivers/media/i2c/imx214.c
+ +F:    Documentation/devicetree/bindings/media/i2c/sony,imx214.txt
+ +
   SONY IMX258 SENSOR DRIVER
   M:    Sakari Ailus <sakari.ailus@linux.intel.com>
   L:    linux-media@vger.kernel.org
@@@ -14141,7 -13930,6 +14141,7 @@@ S:   Supporte
   F:    Documentation/devicetree/bindings/sound/
   F:    Documentation/sound/soc/
   F:    sound/soc/
+ +F:    include/dt-bindings/sound/
   F:    include/sound/soc*
   
   SOUNDWIRE SUBSYSTEM
@@@ -14189,10 -13977,11 +14189,10 @@@ F:        drivers/tty/serial/sunzilog.
   F:    drivers/tty/vcc.c
   
   SPARSE CHECKER
- -M:    "Christopher Li" <sparse@chrisli.org>
+ +M:    "Luc Van Oostenryck" <luc.vanoostenryck@gmail.com>
   L:    linux-sparse@vger.kernel.org
   W:    https://sparse.wiki.kernel.org/
   T:    git git://git.kernel.org/pub/scm/devel/sparse/sparse.git
- -T:    git git://git.kernel.org/pub/scm/devel/sparse/chrisl/sparse.git
   S:    Maintained
   F:    include/linux/compiler.h
   
@@@ -14240,7 -14029,7 +14240,7 @@@ SPIDERNET NETWORK DRIVER for CEL
   M:    Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
   L:    netdev@vger.kernel.org
   S:    Supported
- -F:    Documentation/networking/spider_net.txt
+ +F:    Documentation/networking/device_drivers/toshiba/spider_net.txt
   F:    drivers/net/ethernet/toshiba/spider_net*
   
   SPMI SUBSYSTEM
@@@ -14289,7 -14078,6 +14289,7 @@@ F:   Documentation/devicetree/bindings/ii
   
   STABLE BRANCH
   M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+ +M:    Sasha Levin <sashal@kernel.org>
   L:    stable@vger.kernel.org
   S:    Supported
   F:    Documentation/process/stable-kernel-rules.rst
@@@ -14956,12 -14744,6 +14956,12 @@@ F: Documentation/devicetree/bindings/cl
   F:    drivers/clk/keystone/sci-clk.c
   F:    drivers/reset/reset-ti-sci.c
   
+ +Texas Instruments ASoC drivers
+ +M:    Peter Ujfalusi <peter.ujfalusi@ti.com>
+ +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
+ +S:    Maintained
+ +F:    sound/soc/ti/
+ +
   THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
   M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
@@@ -15236,7 -15018,7 +15236,7 @@@ M:   Samuel Chessman <chessman@tux.org
   L:    tlan-devel@lists.sourceforge.net (subscribers-only)
   W:    http://sourceforge.net/projects/tlan/
   S:    Maintained
- -F:    Documentation/networking/tlan.txt
+ +F:    Documentation/networking/device_drivers/ti/tlan.txt
   F:    drivers/net/ethernet/ti/tlan.*
   
   TM6000 VIDEO4LINUX DRIVER
@@@ -15290,7 -15072,7 +15290,7 @@@ F:   drivers/platform/x86/topstar-laptop.
   
   TORTURE-TEST MODULES
   M:    Davidlohr Bueso <dave@stgolabs.net>
- -M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+ +M:    "Paul E. McKenney" <paulmck@linux.ibm.com>
   M:    Josh Triplett <josh@joshtriplett.org>
   L:    linux-kernel@vger.kernel.org
   S:    Supported
@@@ -15433,7 -15215,7 +15433,7 @@@ F:   arch/um/os-Linux/drivers
   TURBOCHANNEL SUBSYSTEM
   M:    "Maciej W. Rozycki" <macro@linux-mips.org>
   M:    Ralf Baechle <ralf@linux-mips.org>
- -L:    linux-mips@linux-mips.org
+ +L:    linux-mips@vger.kernel.org
   Q:    http://patchwork.linux-mips.org/project/linux-mips/list/
   S:    Maintained
   F:    drivers/tc/
@@@ -16254,7 -16036,7 +16254,7 @@@ F:   drivers/net/vmxnet3
   
   VOCORE VOCORE2 BOARD
   M:    Harvey Hunt <harveyhuntnexus@gmail.com>
- -L:    linux-mips@linux-mips.org
+ +L:    linux-mips@vger.kernel.org
   S:    Maintained
   F:    arch/mips/boot/dts/ralink/vocore2.dts
   
@@@ -16549,12 -16331,6 +16549,12 @@@ F: include/linux/idr.
   F:    include/linux/xarray.h
   F:    tools/testing/radix-tree
   
+ +XBOX DVD IR REMOTE
+ +M:    Benjamin Valentin <benpicco@googlemail.com>
+ +S:    Maintained
+ +F:    drivers/media/rc/xbox_remote.c
+ +F:    drivers/media/rc/keymaps/rc-xbox-dvd.c
+ +
   XC2028/3028 TUNER DRIVER
   M:    Mauro Carvalho Chehab <mchehab@kernel.org>
   L:    linux-media@vger.kernel.org
@@@ -16601,7 -16377,6 +16601,7 @@@ L:   xen-devel@lists.xenproject.org (mode
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git
   S:    Supported
   F:    arch/x86/xen/
+ +F:    arch/x86/platform/pvh/
   F:    drivers/*/xen-*front.c
   F:    drivers/xen/
   F:    arch/x86/include/asm/xen/
diff --combined Makefile

index 7a2a9a1,a3e2db2..7b4cfa4
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -2,8 -2,8 +2,8 @@@
   VERSION = 4
   PATCHLEVEL = 20
   SUBLEVEL = 0
- -EXTRAVERSION = -rc2
- -NAME = "People's Front"
+ +EXTRAVERSION =
+ +NAME = Shy Crocodile
   
   # *DOCUMENTATION*
   # To see a list of typical targets execute "make help"
@@@ -962,6 -962,11 +962,6 @@@ ifdef CONFIG_STACK_VALIDATIO
     ifeq ($(has_libelf),1)
       objtool_target := tools/objtool FORCE
     else
- -    ifdef CONFIG_UNWINDER_ORC
- -      $(error "Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel")
- -    else
- -      $(warning "Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel")
- -    endif
       SKIP_STACK_VALIDATION := 1
       export SKIP_STACK_VALIDATION
     endif
@@@ -1076,7 -1081,7 +1076,7 @@@ scripts: scripts_basic scripts_dtc asm-
   # version.h and scripts_basic is processed / created.
   
   # Listed in dependency order
- -PHONY += prepare archprepare macroprepare prepare0 prepare1 prepare2 prepare3
+ +PHONY += prepare archprepare prepare0 prepare1 prepare2 prepare3
   
   # prepare3 is used to check if we are building in a separate output directory,
   # and if so do:
@@@ -1099,7 -1104,9 +1099,7 @@@ prepare2: prepare3 outputmakefile asm-g
   prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h
         $(cmd_crmodverdir)
   
- -macroprepare: prepare1 archmacros
- -
- -archprepare: archheaders archscripts macroprepare scripts_basic
+ +archprepare: archheaders archscripts prepare1 scripts_basic
   
   prepare0: archprepare gcc-plugins
         $(Q)$(MAKE) $(build)=.
@@@ -1118,14 -1125,6 +1118,14 @@@ uapi-asm-generic
   
   PHONY += prepare-objtool
   prepare-objtool: $(objtool_target)
+ +ifeq ($(SKIP_STACK_VALIDATION),1)
+ +ifdef CONFIG_UNWINDER_ORC
+ +      @echo "error: Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" >&2
+ +      @false
+ +else
+ +      @echo "warning: Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" >&2
+ +endif
+ +endif
   
   # Generate some files
   # ---------------------------------------------------------------------------
@@@ -1175,6 -1174,9 +1175,6 @@@ archheaders
   PHONY += archscripts
   archscripts:
   
- -PHONY += archmacros
- -archmacros:
- -
   PHONY += __headers
   __headers: $(version_h) scripts_basic uapi-asm-generic archheaders archscripts
         $(Q)$(MAKE) $(build)=scripts build_unifdef
@@@ -1230,10 -1232,13 +1230,13 @@@ ifneq ($(dtstree),
   %.dtb: prepare3 scripts_dtc
         $(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@
   
- PHONY += dtbs dtbs_install
- dtbs: prepare3 scripts_dtc
+ PHONY += dtbs dtbs_install dt_binding_check
+ dtbs dtbs_check: prepare3 scripts_dtc
         $(Q)$(MAKE) $(build)=$(dtstree)
   
+ dtbs_check: export CHECK_DTBS=1
+ dtbs_check: dt_binding_check
+ 
   dtbs_install:
         $(Q)$(MAKE) $(dtbinst)=$(dtstree)
   
@@@ -1247,6 -1252,9 +1250,9 @@@ PHONY += scripts_dt
   scripts_dtc: scripts_basic
         $(Q)$(MAKE) $(build)=scripts/dtc
   
+ dt_binding_check: scripts_dtc
+       $(Q)$(MAKE) $(build)=Documentation/devicetree/bindings
+ 
   # ---------------------------------------------------------------------------
   # Modules
   
@@@ -1609,7 -1617,8 +1615,8 @@@ clean: $(clean-dirs
         $(call cmd,rmfiles)
         @find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \
                 \( -name '*.[aios]' -o -name '*.ko' -o -name '.*.cmd' \
-               -o -name '*.ko.*' -o -name '*.dtb' -o -name '*.dtb.S' \
+               -o -name '*.ko.*' \
+               -o -name '*.dtb' -o -name '*.dtb.S' -o -name '*.dt.yaml' \
                 -o -name '*.dwo' -o -name '*.lst' \
                 -o -name '*.su'  \
                 -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
diff --combined arch/arm64/include/asm/memory.h

index 2bb8721,dc3ca21..e1ec947
--- 1/arch/arm64/include/asm/memory.h
--- 2/arch/arm64/include/asm/memory.h
+++ b/arch/arm64/include/asm/memory.h
@@@ -35,6 -35,15 +35,6 @@@
   #define PCI_IO_SIZE           SZ_16M
   
   /*
- - * Log2 of the upper bound of the size of a struct page. Used for sizing
- - * the vmemmap region only, does not affect actual memory footprint.
- - * We don't use sizeof(struct page) directly since taking its size here
- - * requires its definition to be available at this point in the inclusion
- - * chain, and it may not be a power of 2 in the first place.
- - */
- -#define STRUCT_PAGE_MAX_SHIFT 6
- -
- -/*
    * VMEMMAP_SIZE - allows the whole linear region to be covered by
    *                a struct page array
    */
@@@ -53,11 -62,8 +53,11 @@@
   #define PAGE_OFFSET           (UL(0xffffffffffffffff) - \
         (UL(1) << (VA_BITS - 1)) + 1)
   #define KIMAGE_VADDR          (MODULES_END)
+ +#define BPF_JIT_REGION_START  (VA_START + KASAN_SHADOW_SIZE)
+ +#define BPF_JIT_REGION_SIZE   (SZ_128M)
+ +#define BPF_JIT_REGION_END    (BPF_JIT_REGION_START + BPF_JIT_REGION_SIZE)
   #define MODULES_END           (MODULES_VADDR + MODULES_VSIZE)
- -#define MODULES_VADDR         (VA_START + KASAN_SHADOW_SIZE)
+ +#define MODULES_VADDR         (BPF_JIT_REGION_END)
   #define MODULES_VSIZE         (SZ_128M)
   #define VMEMMAP_START         (PAGE_OFFSET - VMEMMAP_SIZE)
   #define PCI_IO_END            (VMEMMAP_START - SZ_2M)
@@@ -67,24 -73,15 +67,24 @@@
   #define KERNEL_START      _text
   #define KERNEL_END        _end
   
+ +#ifdef CONFIG_ARM64_USER_VA_BITS_52
+ +#define MAX_USER_VA_BITS      52
+ +#else
+ +#define MAX_USER_VA_BITS      VA_BITS
+ +#endif
+ +
   /*
- - * KASAN requires 1/8th of the kernel virtual address space for the shadow
- - * region. KASAN can bloat the stack significantly, so double the (minimum)
- - * stack size when KASAN is in use.
+ + * Generic and tag-based KASAN require 1/8th and 1/16th of the kernel virtual
+ + * address space for the shadow region respectively. They can bloat the stack
+ + * significantly, so double the (minimum) stack size when they are in use.
    */
   #ifdef CONFIG_KASAN
- -#define KASAN_SHADOW_SCALE_SHIFT 3
   #define KASAN_SHADOW_SIZE     (UL(1) << (VA_BITS - KASAN_SHADOW_SCALE_SHIFT))
+ +#ifdef CONFIG_KASAN_EXTRA
+ +#define KASAN_THREAD_SHIFT    2
+ +#else
   #define KASAN_THREAD_SHIFT    1
+ +#endif /* CONFIG_KASAN_EXTRA */
   #else
   #define KASAN_SHADOW_SIZE     (0)
   #define KASAN_THREAD_SHIFT    0
@@@ -171,14 -168,6 +171,6 @@@
   #define IOREMAP_MAX_ORDER     (PMD_SHIFT)
   #endif
   
- #ifdef CONFIG_BLK_DEV_INITRD
- #define __early_init_dt_declare_initrd(__start, __end)                        \
-       do {                                                            \
-               initrd_start = (__start);                               \
-               initrd_end = (__end);                                   \
-       } while (0)
- #endif
- 
   #ifndef __ASSEMBLY__
   
   #include <linux/bitops.h>
@@@ -199,9 -188,6 +191,9 @@@ static inline unsigned long kaslr_offse
         return kimage_vaddr - KIMAGE_VADDR;
   }
   
+ +/* the actual size of a user virtual address */
+ +extern u64                    vabits_user;
+ +
   /*
    * Allow all memory at the discovery stage. We will clip it later.
    */
@@@ -219,26 -205,6 +211,26 @@@
   #define PHYS_PFN_OFFSET       (PHYS_OFFSET >> PAGE_SHIFT)
   
   /*
+ + * When dealing with data aborts, watchpoints, or instruction traps we may end
+ + * up with a tagged userland pointer. Clear the tag to get a sane pointer to
+ + * pass on to access_ok(), for instance.
+ + */
+ +#define untagged_addr(addr)   \
+ +      ((__typeof__(addr))sign_extend64((u64)(addr), 55))
+ +
+ +#ifdef CONFIG_KASAN_SW_TAGS
+ +#define __tag_shifted(tag)    ((u64)(tag) << 56)
+ +#define __tag_set(addr, tag)  (__typeof__(addr))( \
+ +              ((u64)(addr) & ~__tag_shifted(0xff)) | __tag_shifted(tag))
+ +#define __tag_reset(addr)     untagged_addr(addr)
+ +#define __tag_get(addr)               (__u8)((u64)(addr) >> 56)
+ +#else
+ +#define __tag_set(addr, tag)  (addr)
+ +#define __tag_reset(addr)     (addr)
+ +#define __tag_get(addr)               0
+ +#endif
+ +
+ +/*
    * Physical vs virtual RAM address space conversion.  These are
    * private definitions which should NOT be used outside memory.h
    * files.  Use virt_to_phys/phys_to_virt/__pa/__va instead.
@@@ -321,13 -287,7 +313,13 @@@ static inline void *phys_to_virt(phys_a
   #define __virt_to_pgoff(kaddr)        (((u64)(kaddr) & ~PAGE_OFFSET) / PAGE_SIZE * sizeof(struct page))
   #define __page_to_voff(kaddr) (((u64)(kaddr) & ~VMEMMAP_START) * PAGE_SIZE / sizeof(struct page))
   
- -#define page_to_virt(page)    ((void *)((__page_to_voff(page)) | PAGE_OFFSET))
+ +#define page_to_virt(page)    ({                                      \
+ +      unsigned long __addr =                                          \
+ +              ((__page_to_voff(page)) | PAGE_OFFSET);                 \
+ +      __addr = __tag_set(__addr, page_kasan_tag(page));               \
+ +      ((void *)__addr);                                               \
+ +})
+ +
   #define virt_to_page(vaddr)   ((struct page *)((__virt_to_pgoff(vaddr)) | VMEMMAP_START))
   
   #define _virt_addr_valid(kaddr)       pfn_valid((((u64)(kaddr) & ~PAGE_OFFSET) \
@@@ -335,10 -295,9 +327,10 @@@
   #endif
   #endif
   
- -#define _virt_addr_is_linear(kaddr)   (((u64)(kaddr)) >= PAGE_OFFSET)
- -#define virt_addr_valid(kaddr)                (_virt_addr_is_linear(kaddr) && \
- -                                       _virt_addr_valid(kaddr))
+ +#define _virt_addr_is_linear(kaddr)   \
+ +      (__tag_reset((u64)(kaddr)) >= PAGE_OFFSET)
+ +#define virt_addr_valid(kaddr)                \
+ +      (_virt_addr_is_linear(kaddr) && _virt_addr_valid(kaddr))
   
   #include <asm-generic/memory_model.h>
   
diff --combined arch/arm64/mm/init.c

index cbba537,ecc316b..a8f2e47
--- 1/arch/arm64/mm/init.c
--- 2/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@@ -59,28 -59,8 +59,10 @@@
    * that cannot be mistaken for a real physical address.
    */
   s64 memstart_addr __ro_after_init = -1;
+ +EXPORT_SYMBOL(memstart_addr);
+ +
   phys_addr_t arm64_dma_phys_limit __ro_after_init;
   
- #ifdef CONFIG_BLK_DEV_INITRD
- static int __init early_initrd(char *p)
- {
-       unsigned long start, size;
-       char *endp;
- 
-       start = memparse(p, &endp);
-       if (*endp == ',') {
-               size = memparse(endp + 1, NULL);
- 
-               initrd_start = start;
-               initrd_end = start + size;
-       }
-       return 0;
- }
- early_param("initrd", early_initrd);
- #endif
- 
   #ifdef CONFIG_KEXEC_CORE
   /*
    * reserve_crashkernel() - reserves memory for crash kernel
@@@ -291,14 -271,6 +273,14 @@@ int pfn_valid(unsigned long pfn
   
         if ((addr >> PAGE_SHIFT) != pfn)
                 return 0;
+ +
+ +#ifdef CONFIG_SPARSEMEM
+ +      if (pfn_to_section_nr(pfn) >= NR_MEM_SECTIONS)
+ +              return 0;
+ +
+ +      if (!valid_section(__nr_to_section(pfn_to_section_nr(pfn))))
+ +              return 0;
+ +#endif
         return memblock_is_map_memory(addr);
   }
   EXPORT_SYMBOL(pfn_valid);
@@@ -417,14 -389,14 +399,14 @@@ void __init arm64_memblock_init(void
                 memblock_add(__pa_symbol(_text), (u64)(_end - _text));
         }
   
-       if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && initrd_start) {
+       if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && phys_initrd_size) {
                 /*
                  * Add back the memory we just removed if it results in the
                  * initrd to become inaccessible via the linear mapping.
                  * Otherwise, this is a no-op
                  */
-               u64 base = initrd_start & PAGE_MASK;
-               u64 size = PAGE_ALIGN(initrd_end) - base;
+               u64 base = phys_initrd_start & PAGE_MASK;
+               u64 size = PAGE_ALIGN(phys_initrd_size);
   
                 /*
                  * We can only add back the initrd memory if we don't end up
@@@ -468,15 -440,11 +450,11 @@@
          * pagetables with memblock.
          */
         memblock_reserve(__pa_symbol(_text), _end - _text);
- #ifdef CONFIG_BLK_DEV_INITRD
-       if (initrd_start) {
-               memblock_reserve(initrd_start, initrd_end - initrd_start);
- 
+       if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && phys_initrd_size) {
                 /* the generic initrd code expects virtual addresses */
-               initrd_start = __phys_to_virt(initrd_start);
-               initrd_end = __phys_to_virt(initrd_end);
+               initrd_start = __phys_to_virt(phys_initrd_start);
+               initrd_end = initrd_start + phys_initrd_size;
         }
- #endif
   
         early_init_fdt_scan_reserved_mem();
   
@@@ -617,7 -585,15 +595,7 @@@ void __init mem_init(void
          * detected at build time already.
          */
   #ifdef CONFIG_COMPAT
- -      BUILD_BUG_ON(TASK_SIZE_32                       > TASK_SIZE_64);
- -#endif
- -
- -#ifdef CONFIG_SPARSEMEM_VMEMMAP
- -      /*
- -       * Make sure we chose the upper bound of sizeof(struct page)
- -       * correctly when sizing the VMEMMAP array.
- -       */
- -      BUILD_BUG_ON(sizeof(struct page) > (1 << STRUCT_PAGE_MAX_SHIFT));
+ +      BUILD_BUG_ON(TASK_SIZE_32 > DEFAULT_MAP_WINDOW_64);
   #endif
   
         if (PAGE_SIZE >= 16384 && get_num_physpages() <= 128) {
diff --combined drivers/irqchip/irq-gic-v3.c

index d3d4f65,29e9d47..0868a9d
--- 1/drivers/irqchip/irq-gic-v3.c
--- 2/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@@ -41,8 -41,6 +41,8 @@@
   
   #include "irq-gic-common.h"
   
+ +#define FLAGS_WORKAROUND_GICR_WAKER_MSM8996   (1ULL << 0)
+ +
   struct redist_region {
         void __iomem            *redist_base;
         phys_addr_t             phys_base;
@@@ -57,7 -55,6 +57,7 @@@ struct gic_chip_data 
         struct irq_domain       *domain;
         u64                     redist_stride;
         u32                     nr_redist_regions;
+ +      u64                     flags;
         bool                    has_rss;
         unsigned int            irq_nr;
         struct partition_desc   *ppi_descs[16];
@@@ -142,9 -139,6 +142,9 @@@ static void gic_enable_redist(bool enab
         u32 count = 1000000;    /* 1s! */
         u32 val;
   
+ +      if (gic_data.flags & FLAGS_WORKAROUND_GICR_WAKER_MSM8996)
+ +              return;
+ +
         rbase = gic_data_rdist_rd_base();
   
         val = readl_relaxed(rbase + GICR_WAKER);
@@@ -1073,15 -1067,6 +1073,15 @@@ static const struct irq_domain_ops part
         .select = gic_irq_domain_select,
   };
   
+ +static bool gic_enable_quirk_msm8996(void *data)
+ +{
+ +      struct gic_chip_data *d = data;
+ +
+ +      d->flags |= FLAGS_WORKAROUND_GICR_WAKER_MSM8996;
+ +
+ +      return true;
+ +}
+ +
   static int __init gic_init_bases(void __iomem *dist_base,
                                  struct redist_region *rdist_regs,
                                  u32 nr_redist_regions,
@@@ -1199,8 -1184,8 +1199,8 @@@ static void __init gic_populate_ppi_par
   
                 part->partition_id = of_node_to_fwnode(child_part);
   
-               pr_info("GIC: PPI partition %s[%d] { ",
-                       child_part->name, part_idx);
+               pr_info("GIC: PPI partition %pOFn[%d] { ",
+                       child_part, part_idx);
   
                 n = of_property_count_elems_of_size(child_part, "affinity",
                                                     sizeof(u32));
@@@ -1286,16 -1271,6 +1286,16 @@@ static void __init gic_of_setup_kvm_inf
         gic_set_kvm_info(&gic_v3_kvm_info);
   }
   
+ +static const struct gic_quirk gic_quirks[] = {
+ +      {
+ +              .desc   = "GICv3: Qualcomm MSM8996 broken firmware",
+ +              .compatible = "qcom,msm8996-gic-v3",
+ +              .init   = gic_enable_quirk_msm8996,
+ +      },
+ +      {
+ +      }
+ +};
+ +
   static int __init gic_of_init(struct device_node *node, struct device_node *parent)
   {
         void __iomem *dist_base;
@@@ -1343,8 -1318,6 +1343,8 @@@
         if (of_property_read_u64(node, "redistributor-stride", &redist_stride))
                 redist_stride = 0;
   
+ +      gic_enable_of_quirks(node, gic_quirks, &gic_data);
+ +
         err = gic_init_bases(dist_base, rdist_regs, nr_redist_regions,
                              redist_stride, &node->fwnode);
         if (err)
diff --combined drivers/memory/omap-gpmc.c

index e1d91e6,8abb9e9..a2188f7
--- 1/drivers/memory/omap-gpmc.c
--- 2/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@@ -21,7 -21,6 +21,7 @@@
   #include <linux/spinlock.h>
   #include <linux/io.h>
   #include <linux/gpio/driver.h>
+ +#include <linux/gpio/consumer.h> /* GPIO descriptor enum */
   #include <linux/interrupt.h>
   #include <linux/irqdomain.h>
   #include <linux/platform_device.h>
@@@ -2146,8 -2145,8 +2146,8 @@@ static int gpmc_probe_generic_child(str
                         gpmc_s.device_width = GPMC_DEVWIDTH_16BIT;
                         break;
                 default:
-                       dev_err(&pdev->dev, "%s: invalid 'nand-bus-width'\n",
-                               child->name);
+                       dev_err(&pdev->dev, "%pOFn: invalid 'nand-bus-width'\n",
+                               child);
                         ret = -EINVAL;
                         goto err;
                 }
@@@ -2171,8 -2170,7 +2171,8 @@@
                 unsigned int wait_pin = gpmc_s.wait_pin;
   
                 waitpin_desc = gpiochip_request_own_desc(&gpmc->gpio_chip,
- -                                                       wait_pin, "WAITPIN");
+ +                                                       wait_pin, "WAITPIN",
+ +                                                       0);
                 if (IS_ERR(waitpin_desc)) {
                         dev_err(&pdev->dev, "invalid wait-pin: %d\n", wait_pin);
                         ret = PTR_ERR(waitpin_desc);
@@@ -2188,8 -2186,8 +2188,8 @@@
   
         ret = gpmc_cs_set_timings(cs, &gpmc_t, &gpmc_s);
         if (ret) {
-               dev_err(&pdev->dev, "failed to set gpmc timings for: %s\n",
-                       child->name);
+               dev_err(&pdev->dev, "failed to set gpmc timings for: %pOFn\n",
+                       child);
                 goto err_cs;
         }
   
@@@ -2217,7 -2215,7 +2217,7 @@@ no_timings
   
   err_child_fail:
   
-       dev_err(&pdev->dev, "failed to create gpmc child %s\n", child->name);
+       dev_err(&pdev->dev, "failed to create gpmc child %pOFn\n", child);
         ret = -ENODEV;
   
   err_cs:
@@@ -2267,14 -2265,10 +2267,10 @@@ static void gpmc_probe_dt_children(stru
         struct device_node *child;
   
         for_each_available_child_of_node(pdev->dev.of_node, child) {
- 
-               if (!child->name)
-                       continue;
- 
                 ret = gpmc_probe_generic_child(pdev, child);
                 if (ret) {
-                       dev_err(&pdev->dev, "failed to probe DT child '%s': %d\n",
-                               child->name, ret);
+                       dev_err(&pdev->dev, "failed to probe DT child '%pOFn': %d\n",
+                               child, ret);
                 }
         }
   }
diff --combined drivers/of/pdt.c

index c163304,4fc0fd9..d318506
--- 1/drivers/of/pdt.c
--- 2/drivers/of/pdt.c
+++ b/drivers/of/pdt.c
@@@ -21,8 -21,6 +21,6 @@@
   
   static struct of_pdt_ops *of_pdt_prom_ops __initdata;
   
- void __initdata (*of_pdt_build_more)(struct device_node *dp);
- 
   #if defined(CONFIG_SPARC)
   unsigned int of_pdt_unique_id __initdata;
   
@@@ -32,7 -30,24 +30,7 @@@
   
   static char * __init of_pdt_build_full_name(struct device_node *dp)
   {
- -      int len, ourlen, plen;
- -      char *n;
- -
- -      dp->path_component_name = build_path_component(dp);
- -
- -      plen = strlen(dp->parent->full_name);
- -      ourlen = strlen(dp->path_component_name);
- -      len = ourlen + plen + 2;
- -
- -      n = prom_early_alloc(len);
- -      strcpy(n, dp->parent->full_name);
- -      if (!of_node_is_root(dp->parent)) {
- -              strcpy(n + plen, "/");
- -              plen++;
- -      }
- -      strcpy(n + plen, dp->path_component_name);
- -
- -      return n;
+ +      return build_path_component(dp);
   }
   
   #else /* CONFIG_SPARC */
@@@ -43,21 -58,23 +41,21 @@@ static inline void irq_trans_init(struc
   static char * __init of_pdt_build_full_name(struct device_node *dp)
   {
         static int failsafe_id = 0; /* for generating unique names on failure */
+ +      const char *name;
+ +      char path[256];
         char *buf;
         int len;
   
- -      if (of_pdt_prom_ops->pkg2path(dp->phandle, NULL, 0, &len))
- -              goto failsafe;
- -
- -      buf = prom_early_alloc(len + 1);
- -      if (of_pdt_prom_ops->pkg2path(dp->phandle, buf, len, &len))
- -              goto failsafe;
- -      return buf;
+ +      if (!of_pdt_prom_ops->pkg2path(dp->phandle, path, sizeof(path), &len)) {
+ +              name = kbasename(path);
+ +              buf = prom_early_alloc(strlen(name) + 1);
+ +              strcpy(buf, name);
+ +              return buf;
+ +      }
   
- - failsafe:
- -      buf = prom_early_alloc(strlen(dp->parent->full_name) +
- -                             strlen(dp->name) + 16);
- -      sprintf(buf, "%s/%s@unknown%i",
- -              of_node_is_root(dp->parent) ? "" : dp->parent->full_name,
- -              dp->name, failsafe_id++);
+ +      name = of_get_property(dp, "name", &len);
+ +      buf = prom_early_alloc(len + 16);
+ +      sprintf(buf, "%s@unknown%i", name, failsafe_id++);
         pr_err("%s: pkg2path failed; assigning %s\n", __func__, buf);
         return buf;
   }
@@@ -162,8 -179,6 +160,8 @@@ static struct device_node * __init of_p
   
         dp->properties = of_pdt_build_prop_list(node);
   
+ +      dp->full_name = of_pdt_build_full_name(dp);
+ +
         irq_trans_init(dp);
   
         return dp;
@@@ -187,11 -202,10 +185,8 @@@ static struct device_node * __init of_p
                         ret = dp;
                 prev_sibling = dp;
   
- -              dp->full_name = of_pdt_build_full_name(dp);
- -
                 dp->child = of_pdt_build_tree(dp, of_pdt_prom_ops->getchild(node));
   
-               if (of_pdt_build_more)
-                       of_pdt_build_more(dp);
- 
                 node = of_pdt_prom_ops->getsibling(node);
         }
   
@@@ -209,6 -223,9 +204,6 @@@ void __init of_pdt_build_devicetree(pha
         of_pdt_prom_ops = ops;
   
         of_root = of_pdt_create_node(root_node, NULL);
- -#if defined(CONFIG_SPARC)
- -      of_root->path_component_name = "";
- -#endif
         of_root->full_name = "/";
   
         of_root->child = of_pdt_build_tree(of_root,
diff --combined include/linux/of.h

index 0fe5bef,18ac892..fe472e5
--- 1/include/linux/of.h
--- 2/include/linux/of.h
+++ b/include/linux/of.h
@@@ -66,6 -66,7 +66,6 @@@ struct device_node 
         unsigned long _flags;
         void    *data;
   #if defined(CONFIG_SPARC)
- -      const char *path_component_name;
         unsigned int unique_id;
         struct of_irq_controller *irq_trans;
   #endif
@@@ -137,11 -138,16 +137,16 @@@ extern struct device_node *of_aliases
   extern struct device_node *of_stdout;
   extern raw_spinlock_t devtree_lock;
   
- /* flag descriptions (need to be visible even when !CONFIG_OF) */
- #define OF_DYNAMIC    1 /* node and properties were allocated via kmalloc */
- #define OF_DETACHED   2 /* node has been detached from the device tree */
- #define OF_POPULATED  3 /* device already created for the node */
- #define OF_POPULATED_BUS      4 /* of_platform_populate recursed to children of this node */
+ /*
+  * struct device_node flag descriptions
+  * (need to be visible even when !CONFIG_OF)
+  */
+ #define OF_DYNAMIC            1 /* (and properties) allocated via kmalloc */
+ #define OF_DETACHED           2 /* detached from the device tree */
+ #define OF_POPULATED          3 /* device already created */
+ #define OF_POPULATED_BUS      4 /* platform bus created for children */
+ #define OF_OVERLAY            5 /* allocated for an overlay */
+ #define OF_OVERLAY_FREE_CSET  6 /* in overlay cset being freed */
   
   #define OF_BAD_ADDR   ((u64)-1)
   
@@@ -984,6 -990,12 +989,12 @@@ static inline int of_map_rid(struct dev
   #define of_node_cmp(s1, s2)           strcasecmp((s1), (s2))
   #endif
   
+ static inline int of_prop_val_eq(struct property *p1, struct property *p2)
+ {
+       return p1->length == p2->length &&
+              !memcmp(p1->value, p2->value, (size_t)p1->length);
+ }
+ 
   #if defined(CONFIG_OF) && defined(CONFIG_NUMA)
   extern int of_node_to_nid(struct device_node *np);
   #else
diff --combined init/do_mounts_initrd.c

index 73e02ea,732d21f..ccfc066
--- 1/init/do_mounts_initrd.c
--- 2/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
@@@ -16,6 -16,9 +16,9 @@@ int initrd_below_start_ok
   unsigned int real_root_dev;   /* do_proc_dointvec cannot handle kdev_t */
   static int __initdata mount_initrd = 1;
   
+ phys_addr_t phys_initrd_start __initdata;
+ unsigned long phys_initrd_size __initdata;
+ 
   static int __init no_initrd(char *str)
   {
         mount_initrd = 0;
@@@ -24,6 -27,23 +27,23 @@@
   
   __setup("noinitrd", no_initrd);
   
+ static int __init early_initrd(char *p)
+ {
+       phys_addr_t start;
+       unsigned long size;
+       char *endp;
+ 
+       start = memparse(p, &endp);
+       if (*endp == ',') {
+               size = memparse(endp + 1, NULL);
+ 
+               phys_initrd_start = start;
+               phys_initrd_size = size;
+       }
+       return 0;
+ }
+ early_param("initrd", early_initrd);
+ 
   static int init_linuxrc(struct subprocess_info *info, struct cred *new)
   {
         ksys_unshare(CLONE_FS | CLONE_FILES);
@@@ -53,6 -73,9 +73,6 @@@ static void __init handle_initrd(void
         ksys_mkdir("/old", 0700);
         ksys_chdir("/old");
   
- -      /* try loading default modules from initrd */
- -      load_default_modules();
- -
         /*
          * In case that a resume from disk is carried out by linuxrc or one of
          * its children, we need to tell the freezer not to wait for us.
author	Linus Torvalds <torvalds@linux-foundation.org>
	Sat, 29 Dec 2018 04:08:34 +0000 (20:08 -0800)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Sat, 29 Dec 2018 04:08:34 +0000 (20:08 -0800)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/memory.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/init.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/irqchip/irq-gic-v3.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/memory/omap-gpmc.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/of/pdt.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/of.h	patch \|	diff1 \|	diff2 \|	blob \| history
init/do_mounts_initrd.c	patch \|	diff1 \|	diff2 \|	blob \| history