1 files changed, 108 insertions, 38 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 32d444476a90..dce5c099f43c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -409,8 +409,7 @@ F:	drivers/platform/x86/wmi.c
 F:      include/uapi/linux/wmi.h
 
 AD1889 ALSA SOUND DRIVER
-M:      Thibaut Varene <T-Bone@parisc-linux.org>
-W:      http://wiki.parisc-linux.org/AD1889
+W:      https://parisc.wiki.kernel.org/index.php/AD1889
 L:      linux-parisc@vger.kernel.org
 S:      Maintained
 F:      sound/pci/ad1889.*
@@ -2848,8 +2847,11 @@ F:	include/uapi/linux/if_bonding.h
 BPF (Safe dynamic programs and tools)
 M:      Alexei Starovoitov <ast@kernel.org>
 M:      Daniel Borkmann <daniel@iogearbox.net>
+R:      Martin KaFai Lau <kafai@fb.com>
+R:      Song Liu <songliubraving@fb.com>
+R:      Yonghong Song <yhs@fb.com>
 L:      netdev@vger.kernel.org
-L:      linux-kernel@vger.kernel.org
+L:      bpf@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
 Q:      https://patchwork.ozlabs.org/project/netdev/list/?delegate=77147
@@ -2873,10 +2875,13 @@ F:	samples/bpf/
 F:      tools/bpf/
 F:      tools/lib/bpf/
 F:      tools/testing/selftests/bpf/
+K:      bpf
+N:      bpf
 
 BPF JIT for ARM
 M:      Shubham Bansal <illusionist.neo@gmail.com>
 L:      netdev@vger.kernel.org
+L:      bpf@vger.kernel.org
 S:      Maintained
 F:      arch/arm/net/
 
@@ -2885,18 +2890,21 @@ 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
+L:      bpf@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
+L:      bpf@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
+L:      bpf@vger.kernel.org
 S:      Supported
 F:      drivers/net/ethernet/netronome/nfp/bpf/
 
@@ -2904,6 +2912,7 @@ 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
+L:      bpf@vger.kernel.org
 S:      Maintained
 F:      arch/powerpc/net/
 
@@ -2911,6 +2920,7 @@ BPF JIT for S390
 M:      Martin Schwidefsky <schwidefsky@de.ibm.com>
 M:      Heiko Carstens <heiko.carstens@de.ibm.com>
 L:      netdev@vger.kernel.org
+L:      bpf@vger.kernel.org
 S:      Maintained
 F:      arch/s390/net/
 X:      arch/s390/net/pnet.c
@@ -2918,12 +2928,14 @@ 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
+L:      bpf@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
+L:      bpf@vger.kernel.org
 S:      Maintained
 F:      arch/x86/net/bpf_jit_comp32.c
 
@@ -2931,6 +2943,7 @@ BPF JIT for X86 64-BIT
 M:      Alexei Starovoitov <ast@kernel.org>
 M:      Daniel Borkmann <daniel@iogearbox.net>
 L:      netdev@vger.kernel.org
+L:      bpf@vger.kernel.org
 S:      Supported
 F:      arch/x86/net/
 X:      arch/x86/net/bpf_jit_comp32.c
@@ -3052,8 +3065,8 @@ F:	include/linux/bcm963xx_nvram.h
 F:      include/linux/bcm963xx_tag.h
 
 BROADCOM BNX2 GIGABIT ETHERNET DRIVER
-M:      Rasesh Mody <rasesh.mody@cavium.com>
-M:      Dept-GELinuxNICDev@cavium.com
+M:      Rasesh Mody <rmody@marvell.com>
+M:      GR-Linux-NIC-Dev@marvell.com
 L:      netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/ethernet/broadcom/bnx2.*
@@ -3072,9 +3085,9 @@ S:	Supported
 F:      drivers/scsi/bnx2i/
 
 BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
-M:      Ariel Elior <ariel.elior@cavium.com>
-M:      Sudarsana Kalluru <sudarsana.kalluru@cavium.com>
-M:      everest-linux-l2@cavium.com
+M:      Ariel Elior <aelior@marvell.com>
+M:      Sudarsana Kalluru <skalluru@marvell.com>
+M:      GR-everest-linux-l2@marvell.com
 L:      netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/ethernet/broadcom/bnx2x/
@@ -3249,9 +3262,9 @@ S:	Supported
 F:      drivers/scsi/bfa/
 
 BROCADE BNA 10 GIGABIT ETHERNET DRIVER
-M:      Rasesh Mody <rasesh.mody@cavium.com>
-M:      Sudarsana Kalluru <sudarsana.kalluru@cavium.com>
-M:      Dept-GELinuxNICDev@cavium.com
+M:      Rasesh Mody <rmody@marvell.com>
+M:      Sudarsana Kalluru <skalluru@marvell.com>
+M:      GR-Linux-NIC-Dev@marvell.com
 L:      netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/ethernet/brocade/bna/
@@ -3385,9 +3398,8 @@ F:	Documentation/media/v4l-drivers/cafe_ccic*
 F:      drivers/media/platform/marvell-ccic/
 
 CAIF NETWORK LAYER
-M:      Dmitry Tarnyagin <dmitry.tarnyagin@lockless.no>
 L:      netdev@vger.kernel.org
-S:      Supported
+S:      Orphan
 F:      Documentation/networking/caif/
 F:      drivers/net/caif/
 F:      include/uapi/linux/caif/
@@ -3471,10 +3483,9 @@ F:	drivers/i2c/busses/i2c-octeon*
 F:      drivers/i2c/busses/i2c-thunderx*
 
 CAVIUM LIQUIDIO NETWORK DRIVER
-M:      Derek Chickles <derek.chickles@caviumnetworks.com>
-M:      Satanand Burla <satananda.burla@caviumnetworks.com>
-M:      Felix Manlunas <felix.manlunas@caviumnetworks.com>
-M:      Raghu Vatsavayi <raghu.vatsavayi@caviumnetworks.com>
+M:      Derek Chickles <dchickles@marvell.com>
+M:      Satanand Burla <sburla@marvell.com>
+M:      Felix Manlunas <fmanlunas@marvell.com>
 L:      netdev@vger.kernel.org
 W:      http://www.cavium.com
 S:      Supported
@@ -3951,7 +3962,7 @@ L:	netdev@vger.kernel.org
 S:      Maintained
 F:      drivers/net/ethernet/ti/cpmac.c
 
-CPU FREQUENCY DRIVERS
+CPU FREQUENCY SCALING FRAMEWORK
 M:      "Rafael J. Wysocki" <rjw@rjwysocki.net>
 M:      Viresh Kumar <viresh.kumar@linaro.org>
 L:      linux-pm@vger.kernel.org
@@ -3959,6 +3970,8 @@ S:	Maintained
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
 T:      git git://git.linaro.org/people/vireshk/linux.git (For ARM Updates)
 B:      https://bugzilla.kernel.org
+F:      Documentation/admin-guide/pm/cpufreq.rst
+F:      Documentation/admin-guide/pm/intel_pstate.rst
 F:      Documentation/cpu-freq/
 F:      Documentation/devicetree/bindings/cpufreq/
 F:      drivers/cpufreq/
@@ -3977,6 +3990,7 @@ F:	drivers/cpufreq/arm_big_little.c
 CPU POWER MONITORING SUBSYSTEM
 M:      Thomas Renninger <trenn@suse.com>
 M:      Shuah Khan <shuah@kernel.org>
+M:      Shuah Khan <skhan@linuxfoundation.org>
 L:      linux-pm@vger.kernel.org
 S:      Maintained
 F:      tools/power/cpupower/
@@ -4006,13 +4020,14 @@ S:	Supported
 F:      drivers/cpuidle/cpuidle-exynos.c
 F:      arch/arm/mach-exynos/pm.c
 
-CPUIDLE DRIVERS
+CPU IDLE TIME MANAGEMENT FRAMEWORK
 M:      "Rafael J. Wysocki" <rjw@rjwysocki.net>
 M:      Daniel Lezcano <daniel.lezcano@linaro.org>
 L:      linux-pm@vger.kernel.org
 S:      Maintained
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
 B:      https://bugzilla.kernel.org
+F:      Documentation/admin-guide/pm/cpuidle.rst
 F:      drivers/cpuidle/*
 F:      include/linux/cpuidle.h
 
@@ -5178,7 +5193,7 @@ DRM DRIVERS FOR XEN
 M:      Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
 T:      git git://anongit.freedesktop.org/drm/drm-misc
 L:      dri-devel@lists.freedesktop.org
-L:      xen-devel@lists.xen.org
+L:      xen-devel@lists.xenproject.org (moderated for non-subscribers)
 S:      Supported
 F:      drivers/gpu/drm/xen/
 F:      Documentation/gpu/xen-front.rst
@@ -6143,7 +6158,7 @@ FREESCALE SOC SOUND DRIVERS
 M:      Timur Tabi <timur@kernel.org>
 M:      Nicolin Chen <nicoleotsuka@gmail.com>
 M:      Xiubo Li <Xiubo.Lee@gmail.com>
-R:      Fabio Estevam <fabio.estevam@nxp.com>
+R:      Fabio Estevam <festevam@gmail.com>
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
 L:      linuxppc-dev@lists.ozlabs.org
 S:      Maintained
@@ -8256,6 +8271,7 @@ F:	include/uapi/linux/sunrpc/
 
 KERNEL SELFTEST FRAMEWORK
 M:      Shuah Khan <shuah@kernel.org>
+M:      Shuah Khan <skhan@linuxfoundation.org>
 L:      linux-kselftest@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
 Q:      https://patchwork.kernel.org/project/linux-kselftest/list/
@@ -8478,6 +8494,7 @@ L7 BPF FRAMEWORK
 M:      John Fastabend <john.fastabend@gmail.com>
 M:      Daniel Borkmann <daniel@iogearbox.net>
 L:      netdev@vger.kernel.org
+L:      bpf@vger.kernel.org
 S:      Maintained
 F:      include/linux/skmsg.h
 F:      net/core/skmsg.c
@@ -10686,9 +10703,9 @@ S:	Maintained
 F:      drivers/net/netdevsim/*
 
 NETXEN (1/10) GbE SUPPORT
-M:      Manish Chopra <manish.chopra@cavium.com>
-M:      Rahul Verma <rahul.verma@cavium.com>
-M:      Dept-GELinuxNICDev@cavium.com
+M:      Manish Chopra <manishc@marvell.com>
+M:      Rahul Verma <rahulv@marvell.com>
+M:      GR-Linux-NIC-Dev@marvell.com
 L:      netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/ethernet/qlogic/netxen/
@@ -10889,7 +10906,7 @@ F:	include/linux/nvmem-consumer.h
 F:      include/linux/nvmem-provider.h
 
 NXP SGTL5000 DRIVER
-M:      Fabio Estevam <fabio.estevam@nxp.com>
+M:      Fabio Estevam <festevam@gmail.com>
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:      Maintained
 F:      Documentation/devicetree/bindings/sound/sgtl5000.txt
@@ -11303,10 +11320,12 @@ F:	include/dt-bindings/
 
 OPENCORES I2C BUS DRIVER
 M:      Peter Korsgaard <peter@korsgaard.com>
+M:      Andrew Lunn <andrew@lunn.ch>
 L:      linux-i2c@vger.kernel.org
 S:      Maintained
 F:      Documentation/i2c/busses/i2c-ocores
 F:      drivers/i2c/busses/i2c-ocores.c
+F:      include/linux/platform_data/i2c-ocores.h
 
 OPENRISC ARCHITECTURE
 M:      Jonas Bonn <jonas@southpole.se>
@@ -11477,7 +11496,7 @@ F:	Documentation/blockdev/paride.txt
 F:      drivers/block/paride/
 
 PARISC ARCHITECTURE
-M:      "James E.J. Bottomley" <jejb@parisc-linux.org>
+M:      "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
 M:      Helge Deller <deller@gmx.de>
 L:      linux-parisc@vger.kernel.org
 W:      http://www.parisc-linux.org/
@@ -12472,8 +12491,8 @@ S:	Supported
 F:      drivers/scsi/qedi/
 
 QLOGIC QL4xxx ETHERNET DRIVER
-M:      Ariel Elior <Ariel.Elior@cavium.com>
-M:      everest-linux-l2@cavium.com
+M:      Ariel Elior <aelior@marvell.com>
+M:      GR-everest-linux-l2@marvell.com
 L:      netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/ethernet/qlogic/qed/
@@ -12481,8 +12500,8 @@ F:	include/linux/qed/
 F:      drivers/net/ethernet/qlogic/qede/
 
 QLOGIC QL4xxx RDMA DRIVER
-M:      Michal Kalderon <Michal.Kalderon@cavium.com>
-M:      Ariel Elior <Ariel.Elior@cavium.com>
+M:      Michal Kalderon <mkalderon@marvell.com>
+M:      Ariel Elior <aelior@marvell.com>
 L:      linux-rdma@vger.kernel.org
 S:      Supported
 F:      drivers/infiniband/hw/qedr/
@@ -12502,7 +12521,7 @@ F:	Documentation/scsi/LICENSE.qla2xxx
 F:      drivers/scsi/qla2xxx/
 
 QLOGIC QLA3XXX NETWORK DRIVER
-M:      Dept-GELinuxNICDev@cavium.com
+M:      GR-Linux-NIC-Dev@marvell.com
 L:      netdev@vger.kernel.org
 S:      Supported
 F:      Documentation/networking/device_drivers/qlogic/LICENSE.qla3xxx
@@ -12516,16 +12535,16 @@ F:	Documentation/scsi/LICENSE.qla4xxx
 F:      drivers/scsi/qla4xxx/
 
 QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
-M:      Shahed Shaikh <Shahed.Shaikh@cavium.com>
-M:      Manish Chopra <manish.chopra@cavium.com>
-M:      Dept-GELinuxNICDev@cavium.com
+M:      Shahed Shaikh <shshaikh@marvell.com>
+M:      Manish Chopra <manishc@marvell.com>
+M:      GR-Linux-NIC-Dev@marvell.com
 L:      netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/ethernet/qlogic/qlcnic/
 
 QLOGIC QLGE 10Gb ETHERNET DRIVER
-M:      Manish Chopra <manish.chopra@cavium.com>
-M:      Dept-GELinuxNICDev@cavium.com
+M:      Manish Chopra <manishc@marvell.com>
+M:      GR-Linux-NIC-Dev@marvell.com
 L:      netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/ethernet/qlogic/qlge/
@@ -12864,6 +12883,13 @@ F:	Documentation/devicetree/bindings/net/dsa/realtek-smi.txt
 F:      drivers/net/dsa/realtek-smi*
 F:      drivers/net/dsa/rtl83*
 
+REDPINE WIRELESS DRIVER
+M:      Amitkumar Karwar <amitkarwar@gmail.com>
+M:      Siva Rebbagondla <siva8118@gmail.com>
+L:      linux-wireless@vger.kernel.org
+S:      Maintained
+F:      drivers/net/wireless/rsi/
+
 REGISTER MAP ABSTRACTION
 M:      Mark Brown <broonie@kernel.org>
 L:      linux-kernel@vger.kernel.org
@@ -13692,6 +13718,15 @@ L:	netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/ethernet/sfc/
 
+SFF/SFP/SFP+ MODULE SUPPORT
+M:      Russell King <linux@armlinux.org.uk>
+L:      netdev@vger.kernel.org
+S:      Maintained
+F:      drivers/net/phy/phylink.c
+F:      drivers/net/phy/sfp*
+F:      include/linux/phylink.h
+F:      include/linux/sfp.h
+
 SGI GRU DRIVER
 M:      Dimitri Sivanich <sivanich@sgi.com>
 S:      Maintained
@@ -13820,8 +13855,9 @@ F:	drivers/media/mmc/siano/
 
 SIFIVE DRIVERS
 M:      Palmer Dabbelt <palmer@sifive.com>
+M:      Paul Walmsley <paul.walmsley@sifive.com>
 L:      linux-riscv@lists.infradead.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux.git
+T:      git git://github.com/sifive/riscv-linux.git
 S:      Supported
 K:      sifive
 N:      sifive
@@ -14432,6 +14468,11 @@ M:	Florian Schilhabel <florian.c.schilhabel@googlemail.com>.
 S:      Odd Fixes
 F:      drivers/staging/rtl8712/
 
+STAGING - REALTEK RTL8188EU DRIVERS
+M:      Larry Finger <Larry.Finger@lwfinger.net>
+S:      Odd Fixes
+F:      drivers/staging/rtl8188eu/
+
 STAGING - SILICON MOTION SM750 FRAME BUFFER DRIVER
 M:      Sudip Mukherjee <sudipm.mukherjee@gmail.com>
 M:      Teddy Wang <teddy.wang@siliconmotion.com>
@@ -15802,7 +15843,6 @@ M:	Alan Stern <stern@rowland.harvard.edu>
 L:      linux-usb@vger.kernel.org
 L:      usb-storage@lists.one-eyed-alien.net
 S:      Maintained
-W:      http://www.one-eyed-alien.net/~mdharm/linux-usb/
 F:      drivers/usb/storage/
 
 USB MIDI DRIVER
@@ -15834,6 +15874,7 @@ F:	drivers/usb/common/usb-otg-fsm.c
 USB OVER IP DRIVER
 M:      Valentina Manea <valentina.manea.m@gmail.com>
 M:      Shuah Khan <shuah@kernel.org>
+M:      Shuah Khan <skhan@linuxfoundation.org>
 L:      linux-usb@vger.kernel.org
 S:      Maintained
 F:      Documentation/usb/usbip_protocol.txt
@@ -16631,6 +16672,15 @@ S:	Maintained
 F:      drivers/platform/x86/
 F:      drivers/platform/olpc/
 
+X86 PLATFORM DRIVERS - ARCH
+R:      Darren Hart <dvhart@infradead.org>
+R:      Andy Shevchenko <andy@infradead.org>
+L:      platform-driver-x86@vger.kernel.org
+L:      x86@kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
+S:      Maintained
+F:      arch/x86/platform
+
 X86 VDSO
 M:      Andy Lutomirski <luto@kernel.org>
 L:      linux-kernel@vger.kernel.org
@@ -16663,10 +16713,30 @@ T:	git git://linuxtv.org/media_tree.git
 S:      Maintained
 F:      drivers/media/tuners/tuner-xc2028.*
 
+XDP (eXpress Data Path)
+M:      Alexei Starovoitov <ast@kernel.org>
+M:      Daniel Borkmann <daniel@iogearbox.net>
+M:      David S. Miller <davem@davemloft.net>
+M:      Jakub Kicinski <jakub.kicinski@netronome.com>
+M:      Jesper Dangaard Brouer <hawk@kernel.org>
+M:      John Fastabend <john.fastabend@gmail.com>
+L:      netdev@vger.kernel.org
+L:      xdp-newbies@vger.kernel.org
+L:      bpf@vger.kernel.org
+S:      Supported
+F:      net/core/xdp.c
+F:      include/net/xdp.h
+F:      kernel/bpf/devmap.c
+F:      kernel/bpf/cpumap.c
+F:      include/trace/events/xdp.h
+K:      xdp
+N:      xdp
+
 XDP SOCKETS (AF_XDP)
 M:      Björn Töpel <bjorn.topel@intel.com>
 M:      Magnus Karlsson <magnus.karlsson@intel.com>
 L:      netdev@vger.kernel.org
+L:      bpf@vger.kernel.org
 S:      Maintained
 F:      kernel/bpf/xskmap.c
 F:      net/xdp/