Merge tag 'csky-4.20-rc6' of github.com:c-sky/csky-linux

Pull C-SKY fixes from Guo Ren:

 - bugfix for tlb_get_pgd() error

 - update MAINTAINERS file for C-SKY drivers

* tag 'csky-4.20-rc6' of github.com:c-sky/csky-linux:
  csky: bugfix tlb_get_pgd error.
  MAINTAINERS: add maintainer for C-SKY drivers

diff --combined MAINTAINERS
index 6682420,9a44cef..d27401d
--- 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 <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
@@@ -1923,6 -1922,7 +1923,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
@@@ -2490,7 -2490,7 +2490,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
@@@ -2800,7 -2800,7 +2800,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*
@@@ -2820,67 -2820,6 +2820,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
@@@ -2921,7 -2860,7 +2921,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/*
@@@ -2930,6 -2869,7 +2930,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
@@@ -2984,7 -2924,7 +2984,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/*
@@@ -3075,6 -3015,7 +3075,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
@@@ -3121,7 -3062,7 +3121,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/*
  
@@@ -3271,11 -3212,16 +3271,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
  
@@@ -3335,12 -3281,6 +3340,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>
@@@ -4223,7 -4163,7 +4228,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/
@@@ -5314,7 -5254,7 +5319,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*
  
@@@ -5593,7 -5533,6 +5598,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
@@@ -5832,7 -5771,7 +5837,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/
@@@ -6365,7 -6304,6 +6370,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
@@@ -6674,9 -6612,9 +6679,9 @@@ F:      arch/*/include/asm/suspend*.
  
  HID CORE LAYER
  M:    Jiri Kosina <jikos@kernel.org>
 -R:    Benjamin Tissoires <benjamin.tissoires@redhat.com>
 +M:    Benjamin Tissoires <benjamin.tissoires@redhat.com>
  L:    linux-input@vger.kernel.org
 -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*
@@@ -6928,13 -6866,6 +6933,13 @@@ L:    linux-acpi@vger.kernel.or
  S:    Maintained
  F:    drivers/i2c/i2c-core-acpi.c
  
 +I2C CONTROLLER DRIVER FOR NVIDIA GPU
 +M:    Ajay Gupta <ajayg@nvidia.com>
 +L:    linux-i2c@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/i2c/busses/i2c-nvidia-gpu
 +F:    drivers/i2c/busses/i2c-nvidia-gpu.c
 +
  I2C MUXES
  M:    Peter Rosin <peda@axentia.se>
  L:    linux-i2c@vger.kernel.org
@@@ -7503,20 -7434,6 +7508,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>
@@@ -7527,6 -7444,12 +7532,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
@@@ -7614,6 -7537,12 +7619,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>
@@@ -7646,13 -7575,6 +7651,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
@@@ -7761,7 -7683,7 +7766,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
  
@@@ -8132,7 -8054,7 +8137,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
@@@ -8189,7 -8111,7 +8194,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*
@@@ -8308,7 -8230,7 +8313,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
@@@ -8362,7 -8284,7 +8367,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
@@@ -8450,7 -8372,7 +8455,7 @@@ F:      drivers/media/dvb-frontends/lgdt3305
  LIBATA PATA ARASAN COMPACT FLASH CONTROLLER
  M:    Viresh Kumar <vireshk@kernel.org>
  L:    linux-ide@vger.kernel.org
 -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
@@@ -8467,7 -8389,7 +8472,7 @@@ F:      drivers/ata/ata_generic.
  LIBATA PATA FARADAY FTIDE010 AND GEMINI SATA BRIDGE DRIVERS
  M:    Linus Walleij <linus.walleij@linaro.org>
  L:    linux-ide@vger.kernel.org
 -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
@@@ -8486,7 -8408,7 +8491,7 @@@ F:      include/linux/ahci_platform.
  LIBATA SATA PROMISE TX2/TX4 CONTROLLER DRIVER
  M:    Mikael Pettersson <mikpelinux@gmail.com>
  L:    linux-ide@vger.kernel.org
 -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.*
  
@@@ -8925,7 -8847,7 +8930,7 @@@ 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
  
@@@ -9884,7 -9806,7 +9889,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
@@@ -9924,7 -9846,7 +9929,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
@@@ -9937,7 -9859,7 +9942,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
@@@ -9947,7 -9869,7 +9952,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/
@@@ -9955,7 -9877,7 +9960,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/
@@@ -9964,7 -9886,7 +9969,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/
@@@ -9974,7 -9896,7 +9979,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/
@@@ -9984,7 -9906,7 +9989,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
@@@ -10867,14 -10789,6 +10872,14 @@@ L: linux-omap@vger.kernel.or
  S:    Maintained
  F:    arch/arm/mach-omap2/omap_hwmod.*
  
 +OMAP I2C DRIVER
 +M:    Vignesh R <vigneshr@ti.com>
 +L:    linux-omap@vger.kernel.org
 +L:    linux-i2c@vger.kernel.org
 +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 <laurent.pinchart@ideasonboard.com>
  L:    linux-media@vger.kernel.org
@@@ -10884,9 -10798,9 +10889,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
@@@ -10969,7 -10883,7 +10974,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
  
@@@ -11821,7 -11735,6 +11826,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/
  
@@@ -11878,7 -11791,7 +11883,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/
@@@ -12058,7 -11971,7 +12063,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
@@@ -12072,10 -11985,9 +12077,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
@@@ -12538,7 -12450,7 +12543,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
  
@@@ -12558,7 -12470,7 +12563,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
@@@ -14008,7 -13920,6 +14013,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
@@@ -14056,10 -13967,11 +14061,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
  
@@@ -14156,7 -14068,6 +14161,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
@@@ -15294,7 -15205,7 +15299,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/
@@@ -15530,9 -15441,9 +15535,9 @@@ F:   include/linux/usb/gadget
  
  USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)
  M:    Jiri Kosina <jikos@kernel.org>
 -R:    Benjamin Tissoires <benjamin.tissoires@redhat.com>
 +M:    Benjamin Tissoires <benjamin.tissoires@redhat.com>
  L:    linux-usb@vger.kernel.org
 -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/
@@@ -16115,7 -16026,7 +16120,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