Merge tag 'imx8mq-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...

i.MX8MQ device tree support for 4.21:
 - It contains the initial device tree support for i.MX8MQ - the first
   ARM64 i.MX processor.  It features a quad Cortex-A53 core that
   operates at speeds of up to 1.3 GHz, a Cortex-M4 core for
   low-power processing, a DRAM controller that supports 32-bit/16-bit
   LPDDR4/DDR4/DDR3L memory, and hardware acceleration for 4K video
   playback.
 - A couple of patches from Baruch that add watchdog device for i.MX8MQ
   enable it for imx8mq-evk board.

* tag 'imx8mq-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: dts: imx8mq-evk: enable watchdog
  arm64: dts: imx8mq: add watchdog devices
  MAINTAINERS: add i.MX8 DT path to i.MX architecture
  arm64: add support for i.MX8M EVK board
  arm64: add basic DTS for i.MX8MQ
  arm64: add basic Kconfig symbols for i.MX8
  arm64: dts: ls1046a: add qdma device tree nodes
  arm64: dts: ls1043a: add qdma device tree nodes
  arm64: dts: ls1088a: Add missing dma-ranges property
  arm64: dts: ls1088a: Move fsl-mc node
  arm64: dts: fsl: Add all CPUs in cooling maps
  arm64: dts: Add support for NXP LS1028A SoC
  arm64: dts: layerscape: removed compatible string "snps,dw-pcie"
  arm64: dts: fsl: Add the status property disable PCIe
  arm64: dts: ls1012a: Add FRWY-LS1012A board support
  dt-bindings: Add binding for i.MX8MQ CCM
  arm64: dts: add LX2160AQDS board support
  arm64: dts: add LX2160ARDB board support
  arm64: dts: add QorIQ LX2160A SoC support

Signed-off-by: Olof Johansson <[email protected]>

diff --combined MAINTAINERS
index f3a5c97e34196680db3be6e92db9386155a33b7d,c491b90392b4777017b26602b1b758bfc984f12f..e073171e3f8122a7233aca61d9eda11815ad9080
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -180,7 -180,6 +180,7 @@@ F: drivers/net/hamradio/6pack.
  
  8169 10/100/1000 GIGABIT ETHERNET DRIVER
  M:    Realtek linux nic maintainers <[email protected]>
 +M:    Heiner Kallweit <[email protected]>
  L:    [email protected]
  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 <[email protected].com>
 +M:    Thor Thayer <[email protected].com>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -1472,7 -1471,6 +1472,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 <[email protected]>
@@@ -1523,6 -1521,7 +1523,7 @@@ 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/
@@@ -1739,17 -1738,13 +1740,17 @@@ ARM/Mediatek SoC suppor
  M:    Matthias Brugger <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (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
@@@ -1928,6 -1923,7 +1929,6 @@@ ARM/QUALCOMM SUPPOR
  M:    Andy Gross <[email protected]>
  M:    David Brown <[email protected]>
  L:    [email protected]
 -L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/soc/qcom/
  F:    arch/arm/boot/dts/qcom-*.dts
@@@ -2495,7 -2491,7 +2496,7 @@@ F:      drivers/net/wireless/ath/
  ATHEROS ATH5K WIRELESS DRIVER
  M:    Jiri Slaby <[email protected]>
  M:    Nick Kossifidis <[email protected]>
 -M:    "Luis R. Rodriguez" <[email protected]>
 +M:    Luis Chamberlain <[email protected]>
  L:    [email protected]
  W:    http://wireless.kernel.org/en/users/Drivers/ath5k
  S:    Maintained
@@@ -2633,13 -2629,6 +2634,13 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/sound/axentia,*
  F:    sound/soc/atmel/tse850-pcm5142.c
  
 +AXXIA I2C CONTROLLER
 +M:    Krzysztof Adamski <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/i2c/i2c-axxia.txt
 +F:    drivers/i2c/busses/i2c-axxia.c
 +
  AZ6007 DVB DRIVER
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
@@@ -2812,7 -2801,7 +2813,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*
@@@ -2832,67 -2821,6 +2833,67 @@@ F:    tools/bpf
  F:    tools/lib/bpf/
  F:    tools/testing/selftests/bpf/
  
 +BPF JIT for ARM
 +M:    Shubham Bansal <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/arm/net/
 +
 +BPF JIT for ARM64
 +M:    Daniel Borkmann <[email protected]>
 +M:    Alexei Starovoitov <[email protected]>
 +M:    Zi Shen Lim <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    arch/arm64/net/
 +
 +BPF JIT for MIPS (32-BIT AND 64-BIT)
 +M:    Paul Burton <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/mips/net/
 +
 +BPF JIT for NFP NICs
 +M:    Jakub Kicinski <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/ethernet/netronome/nfp/bpf/
 +
 +BPF JIT for POWERPC (32-BIT AND 64-BIT)
 +M:    Naveen N. Rao <[email protected]>
 +M:    Sandipan Das <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/powerpc/net/
 +
 +BPF JIT for S390
 +M:    Martin Schwidefsky <[email protected]>
 +M:    Heiko Carstens <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/sparc/net/
 +
 +BPF JIT for X86 32-BIT
 +M:    Wang YanQing <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/x86/net/bpf_jit_comp32.c
 +
 +BPF JIT for X86 64-BIT
 +M:    Alexei Starovoitov <[email protected]>
 +M:    Daniel Borkmann <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    arch/x86/net/
 +X:    arch/x86/net/bpf_jit_comp32.c
 +
  BROADCOM B44 10/100 ETHERNET DRIVER
  M:    Michael Chan <[email protected]>
  L:    [email protected]
@@@ -2933,7 -2861,7 +2934,7 @@@ F:      drivers/staging/vc04_service
  BROADCOM BCM47XX MIPS ARCHITECTURE
  M:    Hauke Mehrtens <[email protected]>
  M:    Rafał Miłecki <[email protected]>
 -L:    linux-mips@linux-mips.org
 +L:    linux-mips@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/mips/brcm/
  F:    arch/mips/bcm47xx/*
@@@ -2942,6 -2870,7 +2943,6 @@@ F:      arch/mips/include/asm/mach-bcm47xx/
  BROADCOM BCM5301X ARM ARCHITECTURE
  M:    Hauke Mehrtens <[email protected]>
  M:    Rafał Miłecki <[email protected]>
 -M:    Jon Mason <[email protected]>
  M:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -2996,7 -2925,7 +2997,7 @@@ F:      drivers/cpufreq/bmips-cpufreq.
  BROADCOM BMIPS MIPS ARCHITECTURE
  M:    Kevin Cernekee <[email protected]>
  M:    Florian Fainelli <[email protected]>
 -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/*
@@@ -3087,6 -3016,7 +3088,6 @@@ F:      drivers/net/ethernet/broadcom/genet
  BROADCOM IPROC ARM ARCHITECTURE
  M:    Ray Jui <[email protected]>
  M:    Scott Branden <[email protected]>
 -M:    Jon Mason <[email protected]>
  M:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  T:    git git://github.com/broadcom/cygnus-linux.git
@@@ -3133,7 -3063,7 +3134,7 @@@ F:      include/uapi/rdma/bnxt_re-abi.
  
  BROADCOM NVRAM DRIVER
  M:    Rafał Miłecki <[email protected]>
 -L:    linux-mips@linux-mips.org
 +L:    linux-mips@vger.kernel.org
  S:    Maintained
  F:    drivers/firmware/broadcom/*
  
@@@ -3283,16 -3213,11 +3284,16 @@@ S:   Maintaine
  F:    sound/pci/oxygen/
  
  C-SKY ARCHITECTURE
 -M:    Guo Ren <[email protected]>
 +M:    Guo Ren <[email protected]>
  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
  
@@@ -3352,12 -3277,6 +3353,12 @@@ F:    include/uapi/linux/caif
  F:    include/net/caif/
  F:    net/caif/
  
 +CAKE QDISC
 +M:    Toke Høiland-Jørgensen <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    net/sched/sch_cake.c
 +
  CALGARY x86-64 IOMMU
  M:    Muli Ben-Yehuda <[email protected]>
  M:    Jon Mason <[email protected]>
@@@ -4057,7 -3976,7 +4058,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:    [email protected]
  W:    http://www.chelsio.com
  S:    Supported
@@@ -4086,7 -4005,7 +4087,7 @@@ S:      Supporte
  F:    drivers/crypto/chelsio
  
  CXGB4 ETHERNET DRIVER (CXGB4)
 -M:    Ganesh Goudar <ganeshgr@chelsio.com>
 +M:    Arjun Vynipadath <arjun@chelsio.com>
  L:    [email protected]
  W:    http://www.chelsio.com
  S:    Supported
@@@ -4240,7 -4159,7 +4241,7 @@@ F:      net/decnet
  
  DECSTATION PLATFORM SUPPORT
  M:    "Maciej W. Rozycki" <[email protected]>
 -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/
@@@ -4854,7 -4773,6 +4855,7 @@@ F:      include/uapi/drm/vmwgfx_drm.
  
  DRM DRIVERS
  M:    David Airlie <[email protected]>
 +M:    Daniel Vetter <[email protected]>
  L:    [email protected]
  T:    git git://anongit.freedesktop.org/drm/drm
  B:    https://bugs.freedesktop.org/
@@@ -5332,7 -5250,7 +5333,7 @@@ EDAC-CAVIUM OCTEO
  M:    Ralf Baechle <[email protected]>
  M:    David Daney <[email protected]>
  L:    [email protected]
 -L:    linux-mips@linux-mips.org
 +L:    linux-mips@vger.kernel.org
  S:    Supported
  F:    drivers/edac/octeon_edac*
  
@@@ -5611,7 -5529,6 +5612,7 @@@ F:      net/bridge
  ETHERNET PHY LIBRARY
  M:    Andrew Lunn <[email protected]>
  M:    Florian Fainelli <[email protected]>
 +M:    Heiner Kallweit <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-bus-mdio
@@@ -5850,7 -5767,7 +5851,7 @@@ F:      include/uapi/linux/firewire*.
  F:    tools/firewire/
  
  FIRMWARE LOADER (request_firmware)
 -M:    Luis R. Rodriguez <[email protected]>
 +M:    Luis Chamberlain <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/firmware_class/
@@@ -6334,7 -6251,6 +6335,7 @@@ F:      include/uapi/linux/gigaset_dev.
  
  GNSS SUBSYSTEM
  M:    Johan Hovold <[email protected]>
 +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/
@@@ -6384,7 -6300,6 +6385,7 @@@ F:      tools/testing/selftests/gpio
  
  GPIO SUBSYSTEM
  M:    Linus Walleij <[email protected]>
 +M:    Bartosz Golaszewski <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
  S:    Maintained
@@@ -6693,9 -6608,9 +6694,9 @@@ F:      arch/*/include/asm/suspend*.
  
  HID CORE LAYER
  M:    Jiri Kosina <[email protected]>
 -R:    Benjamin Tissoires <[email protected]>
 +M:    Benjamin Tissoires <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git
  S:    Maintained
  F:    drivers/hid/
  F:    include/linux/hid*
@@@ -6913,10 -6828,8 +6914,10 @@@ Hyper-V CORE AND DRIVER
  M:    "K. Y. Srinivasan" <[email protected]>
  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:    [email protected]
 -S:    Maintained
 +S:    Supported
  F:    Documentation/networking/netvsc.txt
  F:    arch/x86/include/asm/mshyperv.h
  F:    arch/x86/include/asm/trace/hyperv.h
@@@ -6949,13 -6862,6 +6950,13 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/i2c/i2c-core-acpi.c
  
 +I2C CONTROLLER DRIVER FOR NVIDIA GPU
 +M:    Ajay Gupta <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/i2c/busses/i2c-nvidia-gpu
 +F:    drivers/i2c/busses/i2c-nvidia-gpu.c
 +
  I2C MUXES
  M:    Peter Rosin <[email protected]>
  L:    [email protected]
@@@ -7524,20 -7430,6 +7525,20 @@@ S:    Maintaine
  F:    Documentation/fb/intelfb.txt
  F:    drivers/video/fbdev/intelfb/
  
 +INTEL GPIO DRIVERS
 +M:    Andy Shevchenko <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  M:    Zhi Wang <[email protected]>
@@@ -7548,6 -7440,12 +7549,6 @@@ T:     git https://github.com/intel/gvt-lin
  S:    Supported
  F:    drivers/gpu/drm/i915/gvt/
  
 -INTEL PMIC GPIO DRIVER
 -R:    Andy Shevchenko <[email protected]>
 -S:    Maintained
 -F:    drivers/gpio/gpio-*cove.c
 -F:    drivers/gpio/gpio-msic.c
 -
  INTEL HID EVENT DRIVER
  M:    Alex Hung <[email protected]>
  L:    [email protected]
@@@ -7635,6 -7533,12 +7636,6 @@@ W:     https://01.org/linux-acp
  S:    Supported
  F:    drivers/platform/x86/intel_menlow.c
  
 -INTEL MERRIFIELD GPIO DRIVER
 -M:    Andy Shevchenko <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/gpio/gpio-merrifield.c
 -
  INTEL MIC DRIVERS (mic)
  M:    Sudeep Dutt <[email protected]>
  M:    Ashutosh Dixit <[email protected]>
@@@ -7667,13 -7571,6 +7668,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 <[email protected]>
 +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 <[email protected]>
  S:    Maintained
@@@ -7782,7 -7679,7 +7783,7 @@@ F:      Documentation/devicetree/bindings/ii
  
  IOC3 ETHERNET DRIVER
  M:    Ralf Baechle <[email protected]>
 -L:    linux-mips@linux-mips.org
 +L:    linux-mips@vger.kernel.org
  S:    Maintained
  F:    drivers/net/ethernet/sgi/ioc3-eth.c
  
@@@ -8153,7 -8050,7 +8154,7 @@@ F:      tools/testing/selftests
  F:    Documentation/dev-tools/kselftest*
  
  KERNEL USERMODE HELPER
 -M:    "Luis R. Rodriguez" <[email protected]>
 +M:    Luis Chamberlain <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    kernel/umh.c
@@@ -8210,7 -8107,7 +8211,7 @@@ F:      arch/arm64/kvm
  
  KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
  M:    James Hogan <[email protected]>
 -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*
@@@ -8329,7 -8226,7 +8330,7 @@@ F:      mm/kmemleak.
  F:    mm/kmemleak-test.c
  
  KMOD KERNEL MODULE LOADER - USERMODE HELPER
 -M:    "Luis R. Rodriguez" <[email protected]>
 +M:    Luis Chamberlain <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    kernel/kmod.c
@@@ -8383,7 -8280,7 +8384,7 @@@ F:      drivers/net/dsa/lantiq_gswip.
  
  LANTIQ MIPS ARCHITECTURE
  M:    John Crispin <[email protected]>
 -L:    linux-mips@linux-mips.org
 +L:    linux-mips@vger.kernel.org
  S:    Maintained
  F:    arch/mips/lantiq
  F:    drivers/soc/lantiq
@@@ -8471,7 -8368,7 +8472,7 @@@ F:      drivers/media/dvb-frontends/lgdt3305
  LIBATA PATA ARASAN COMPACT FLASH CONTROLLER
  M:    Viresh Kumar <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  S:    Maintained
  F:    include/linux/pata_arasan_cf_data.h
  F:    drivers/ata/pata_arasan_cf.c
@@@ -8488,7 -8385,7 +8489,7 @@@ F:      drivers/ata/ata_generic.
  LIBATA PATA FARADAY FTIDE010 AND GEMINI SATA BRIDGE DRIVERS
  M:    Linus Walleij <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  S:    Maintained
  F:    drivers/ata/pata_ftide010.c
  F:    drivers/ata/sata_gemini.c
@@@ -8507,7 -8404,7 +8508,7 @@@ F:      include/linux/ahci_platform.
  LIBATA SATA PROMISE TX2/TX4 CONTROLLER DRIVER
  M:    Mikael Pettersson <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  S:    Maintained
  F:    drivers/ata/sata_promise.*
  
@@@ -8946,13 -8843,13 +8947,13 @@@ S:   Maintaine
  
  MARDUK (CREATOR CI40) DEVICE TREE SUPPORT
  M:    Rahul Bedarkar <[email protected]>
 -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 <[email protected]>
 -M:    Vivien Didelot <vivien.didelot@savoirfairelinux.com>
 +M:    Vivien Didelot <vivien.didelot@gmail.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/dsa/mv88e6xxx/
@@@ -9457,13 -9354,6 +9458,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 <[email protected]>
 +M:    Lorenzo Bianconi <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/wireless/mediatek/mt76/
 +
  MEDIATEK MT7601U WIRELESS LAN DRIVER
  M:    Jakub Kicinski <[email protected]>
  L:    [email protected]
@@@ -9912,7 -9802,7 +9913,7 @@@ F:      drivers/dma/at_xdmac.
  
  MICROSEMI MIPS SOCS
  M:    Alexandre Belloni <[email protected]>
 -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
@@@ -9952,7 -9842,7 +9953,7 @@@ MIP
  M:    Ralf Baechle <[email protected]>
  M:    Paul Burton <[email protected]>
  M:    James Hogan <[email protected]>
 -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
@@@ -9965,7 -9855,7 +9966,7 @@@ F:      drivers/platform/mips
  
  MIPS BOSTON DEVELOPMENT BOARD
  M:    Paul Burton <[email protected]>
 -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
@@@ -9975,7 -9865,7 +9976,7 @@@ F:      include/dt-bindings/clock/boston-clo
  
  MIPS GENERIC PLATFORM
  M:    Paul Burton <[email protected]>
 -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/
@@@ -9983,7 -9873,7 +9984,7 @@@ F:      arch/mips/tools/generic-board-config
  
  MIPS/LOONGSON1 ARCHITECTURE
  M:    Keguang Zhang <[email protected]>
 -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/
@@@ -9992,7 -9882,7 +9993,7 @@@ F:      drivers/*/*/*loongson1
  
  MIPS/LOONGSON2 ARCHITECTURE
  M:    Jiaxun Yang <[email protected]>
 -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/
@@@ -10002,7 -9892,7 +10003,7 @@@ F:    drivers/*/*/*loongson2
  
  MIPS/LOONGSON3 ARCHITECTURE
  M:    Huacai Chen <[email protected]>
 -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/
@@@ -10012,7 -9902,7 +10013,7 @@@ F:    drivers/*/*/*loongson3
  
  MIPS RINT INSTRUCTION EMULATION
  M:    Aleksandar Markovic <[email protected]>
 -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
@@@ -10026,9 -9916,12 +10027,9 @@@ S:   Odd Fixe
  F:    drivers/media/radio/radio-miropcm20*
  
  MMP SUPPORT
 -M:    Eric Miao <[email protected]>
 -M:    Haojian Zhuang <[email protected]>
 +R:    Lubomir Rintel <[email protected]>
  L:    [email protected] (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/
  
@@@ -10434,7 -10327,7 +10435,7 @@@ F:   drivers/net/wireless
  
  NETWORKING [DSA]
  M:    Andrew Lunn <[email protected]>
 -M:    Vivien Didelot <vivien.didelot@savoirfairelinux.com>
 +M:    Vivien Didelot <vivien.didelot@gmail.com>
  M:    Florian Fainelli <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/dsa/
@@@ -10892,14 -10785,6 +10893,14 @@@ L: [email protected]
  S:    Maintained
  F:    arch/arm/mach-omap2/omap_hwmod.*
  
 +OMAP I2C DRIVER
 +M:    Vignesh R <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/i2c/i2c-omap.txt
 +F:    drivers/i2c/busses/i2c-omap.c
 +
  OMAP IMAGING SUBSYSTEM (OMAP3 ISP and OMAP4 ISS)
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
@@@ -10909,9 -10794,9 +10910,9 @@@ F:   drivers/media/platform/omap3isp
  F:    drivers/staging/media/omap4iss/
  
  OMAP MMC SUPPORT
 -M:    Jarkko Lavinen <[email protected]>
 +M:    Aaro Koskinen <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/mmc/host/omap.c
  
  OMAP POWER MANAGEMENT SUPPORT
@@@ -10994,7 -10879,7 +10995,7 @@@ F:   include/linux/platform_data/i2c-omap
  
  ONION OMEGA2+ BOARD
  M:    Harvey Hunt <[email protected]>
 -L:    linux-mips@linux-mips.org
 +L:    linux-mips@vger.kernel.org
  S:    Maintained
  F:    arch/mips/boot/dts/ralink/omega2p.dts
  
@@@ -11846,7 -11731,6 +11847,7 @@@ F:   Documentation/devicetree/bindings/pi
  PIN CONTROLLER - INTEL
  M:    Mika Westerberg <[email protected]>
  M:    Andy Shevchenko <[email protected]>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git
  S:    Maintained
  F:    drivers/pinctrl/intel/
  
@@@ -11903,7 -11787,7 +11904,7 @@@ F:   drivers/pinctrl/spear
  
  PISTACHIO SOC SUPPORT
  M:    James Hartley <[email protected]>
 -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/
@@@ -12083,7 -11967,7 +12084,7 @@@ F:   kernel/printk
  F:    include/linux/printk.h
  
  PRISM54 WIRELESS DRIVER
 -M:    "Luis R. Rodriguez" <[email protected]>
 +M:    Luis Chamberlain <[email protected]>
  L:    [email protected]
  W:    http://wireless.kernel.org/en/users/Drivers/p54
  S:    Obsolete
@@@ -12097,10 -11981,9 +12098,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" <[email protected]>
 +M:    Luis Chamberlain <[email protected]>
  M:    Kees Cook <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -12563,7 -12446,7 +12564,7 @@@ F:   drivers/media/usb/rainshadow-cec/
  
  RALINK MIPS ARCHITECTURE
  M:    John Crispin <[email protected]>
 -L:    linux-mips@linux-mips.org
 +L:    linux-mips@vger.kernel.org
  S:    Maintained
  F:    arch/mips/ralink
  
@@@ -12583,7 -12466,7 +12584,7 @@@ F:   drivers/block/brd.
  
  RANCHU VIRTUAL BOARD FOR MIPS
  M:    Miodrag Dinic <[email protected]>
 -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
@@@ -13908,13 -13791,6 +13909,13 @@@ F: drivers/md/raid
  F:    include/linux/raid/
  F:    include/uapi/linux/raid/
  
 +SOCIONEXT (SNI) AVE NETWORK DRIVER
 +M:    Kunihiko Hayashi <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -14040,7 -13916,6 +14041,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
@@@ -14088,10 -13963,11 +14089,10 @@@ F:        drivers/tty/serial/sunzilog.
  F:    drivers/tty/vcc.c
  
  SPARSE CHECKER
 -M:    "Christopher Li" <[email protected]>
 +M:    "Luc Van Oostenryck" <[email protected]>
  L:    [email protected]
  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
  
@@@ -14188,7 -14064,6 +14189,7 @@@ F:   Documentation/devicetree/bindings/ii
  
  STABLE BRANCH
  M:    Greg Kroah-Hartman <[email protected]>
 +M:    Sasha Levin <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/process/stable-kernel-rules.rst
@@@ -15326,7 -15201,7 +15327,7 @@@ F:   arch/um/os-Linux/drivers
  TURBOCHANNEL SUBSYSTEM
  M:    "Maciej W. Rozycki" <[email protected]>
  M:    Ralf Baechle <[email protected]>
 -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/
@@@ -15562,9 -15437,9 +15563,9 @@@ F:   include/linux/usb/gadget
  
  USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)
  M:    Jiri Kosina <[email protected]>
 -R:    Benjamin Tissoires <[email protected]>
 +M:    Benjamin Tissoires <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git
  S:    Maintained
  F:    Documentation/hid/hiddev.txt
  F:    drivers/hid/usbhid/
@@@ -16147,7 -16022,7 +16148,7 @@@ F:   drivers/net/vmxnet3
  
  VOCORE VOCORE2 BOARD
  M:    Harvey Hunt <[email protected]>
 -L:    linux-mips@linux-mips.org
 +L:    linux-mips@vger.kernel.org
  S:    Maintained
  F:    arch/mips/boot/dts/ralink/vocore2.dts