git.samba.org / sfrench / cifs-2.6.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge tag 'sound-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
[sfrench/cifs-2.6.git] / MAINTAINERS
diff --git a/MAINTAINERS b/MAINTAINERS
index 8982c6e013b3c04a4c9dd3f6e268b59016c5600a..3e6fa02e14b733ef6f83a782ecac7a7564e27376 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -345,7 +345,7 @@ F:  drivers/acpi/apei/
 
 ACPI COMPONENT ARCHITECTURE (ACPICA)
 M:     Robert Moore <robert.moore@intel.com>
-M:     Erik Schmauss <erik.schmauss@intel.com>
+M:     Erik Kaneda <erik.kaneda@intel.com>
 M:     "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
 L:     linux-acpi@vger.kernel.org
 L:     devel@acpica.org
@@ -720,7 +720,7 @@ F:  Documentation/devicetree/bindings/i2c/i2c-altera.txt
 F:     drivers/i2c/busses/i2c-altera.c
 
 ALTERA MAILBOX DRIVER
-M:     Ley Foon Tan <lftan@altera.com>
+M:     Ley Foon Tan <ley.foon.tan@intel.com>
 L:     nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
 S:     Maintained
 F:     drivers/mailbox/mailbox-altera.c
@@ -791,7 +791,6 @@ F:  include/uapi/rdma/efa-abi.h
 
 AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
 M:     Tom Lendacky <thomas.lendacky@amd.com>
-M:     Gary Hook <gary.hook@amd.com>
 L:     linux-crypto@vger.kernel.org
 S:     Supported
 F:     drivers/crypto/ccp/
@@ -977,6 +976,15 @@ W: http://ez.analog.com/community/linux-device-drivers
 F:     drivers/iio/imu/adis16460.c
 F:     Documentation/devicetree/bindings/iio/imu/adi,adis16460.yaml
 
+ANALOG DEVICES INC ADM1177 DRIVER
+M:     Beniamin Bia <beniamin.bia@analog.com>
+M:     Michael Hennerich <Michael.Hennerich@analog.com>
+L:     linux-hwmon@vger.kernel.org
+W:     http://ez.analog.com/community/linux-device-drivers
+S:     Supported
+F:     drivers/hwmon/adm1177.c
+F:     Documentation/devicetree/bindings/hwmon/adi,adm1177.yaml
+
 ANALOG DEVICES INC ADP5061 DRIVER
 M:     Stefan Popa <stefan.popa@analog.com>
 L:     linux-pm@vger.kernel.org
@@ -1407,7 +1415,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
 
 ARM/ACTIONS SEMI ARCHITECTURE
 M:     Andreas Färber <afaerber@suse.de>
-R:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 N:     owl
@@ -2242,6 +2250,7 @@ L:        linux-rockchip@lists.infradead.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
 S:     Maintained
 F:     Documentation/devicetree/bindings/i2c/i2c-rk3x.txt
+F:     Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml
 F:     arch/arm/boot/dts/rk3*
 F:     arch/arm/boot/dts/rv1108*
 F:     arch/arm/mach-rockchip/
@@ -2694,6 +2703,14 @@ S:       Maintained
 F:     drivers/pinctrl/aspeed/
 F:     Documentation/devicetree/bindings/pinctrl/aspeed,*
 
+ASPEED SCU INTERRUPT CONTROLLER DRIVER
+M:     Eddie James <eajames@linux.ibm.com>
+L:     linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
+S:     Maintained
+F:     Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt
+F:     drivers/irqchip/irq-aspeed-scu-ic.c
+F:     include/dt-bindings/interrupt-controller/aspeed-scu-ic.h
+
 ASPEED VIDEO ENGINE DRIVER
 M:     Eddie James <eajames@linux.ibm.com>
 L:     linux-media@vger.kernel.org
@@ -3150,7 +3167,7 @@ S:        Maintained
 F:     arch/mips/net/
 
 BPF JIT for NFP NICs
-M:     Jakub Kicinski <jakub.kicinski@netronome.com>
+M:     Jakub Kicinski <kuba@kernel.org>
 L:     netdev@vger.kernel.org
 L:     bpf@vger.kernel.org
 S:     Supported
@@ -4848,6 +4865,7 @@ S:        Supported
 F:     net/core/devlink.c
 F:     include/net/devlink.h
 F:     include/uapi/linux/devlink.h
+F:     Documentation/networking/devlink
 
 DIALOG SEMICONDUCTOR DRIVERS
 M:     Support Opensource <support.opensource@diasemi.com>
@@ -6197,6 +6215,7 @@ ETHERNET PHY LIBRARY
 M:     Andrew Lunn <andrew@lunn.ch>
 M:     Florian Fainelli <f.fainelli@gmail.com>
 M:     Heiner Kallweit <hkallweit1@gmail.com>
+R:     Russell King <linux@armlinux.org.uk>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     Documentation/ABI/testing/sysfs-class-net-phydev
@@ -7498,6 +7517,12 @@ S:       Supported
 F:     drivers/scsi/hisi_sas/
 F:     Documentation/devicetree/bindings/scsi/hisilicon-sas.txt
 
+HISILICON V3XX SPI NOR FLASH Controller Driver
+M:     John Garry <john.garry@huawei.com>
+W:     http://www.hisilicon.com
+S:     Maintained
+F:     drivers/spi/spi-hisi-sfc-v3xx.c
+
 HISILICON QM AND ZIP Controller DRIVER
 M:     Zhou Wang <wangzhou1@hisilicon.com>
 L:     linux-crypto@vger.kernel.org
@@ -7841,10 +7866,10 @@ F:      Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.txt
 F:     drivers/i3c/master/dw*
 
 I3C DRIVER FOR CADENCE I3C MASTER IP
-M:      Przemysław Gaj <pgaj@cadence.com>
-S:      Maintained
-F:      Documentation/devicetree/bindings/i3c/cdns,i3c-master.txt
-F:      drivers/i3c/master/i3c-master-cdns.c
+M:     Przemysław Gaj <pgaj@cadence.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/i3c/cdns,i3c-master.txt
+F:     drivers/i3c/master/i3c-master-cdns.c
 
 IA64 (Itanium) PLATFORM
 M:     Tony Luck <tony.luck@intel.com>
@@ -8381,6 +8406,14 @@ Q:       https://patchwork.kernel.org/project/linux-dmaengine/list/
 S:     Supported
 F:     drivers/dma/ioat*
 
+INTEL IADX DRIVER
+M:     Dave Jiang <dave.jiang@intel.com>
+L:     dmaengine@vger.kernel.org
+S:     Supported
+F:     drivers/dma/idxd/*
+F:     include/uapi/linux/idxd.h
+F:     include/linux/idxd.h
+
 INTEL IDLE DRIVER
 M:     Jacob Pan <jacob.jun.pan@linux.intel.com>
 M:     Len Brown <lenb@kernel.org>
@@ -8562,6 +8595,12 @@ S:       Maintained
 F:     arch/x86/include/asm/intel_telemetry.h
 F:     drivers/platform/x86/intel_telemetry*
 
+INTEL UNCORE FREQUENCY CONTROL
+M:     Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
+L:     platform-driver-x86@vger.kernel.org
+S:     Maintained
+F:     drivers/platform/x86/intel-uncore-frequency.c
+
 INTEL VIRTUAL BUTTON DRIVER
 M:     AceLan Kao <acelan.kao@canonical.com>
 L:     platform-driver-x86@vger.kernel.org
@@ -8569,7 +8608,7 @@ S:        Maintained
 F:     drivers/platform/x86/intel-vbtn.c
 
 INTEL WIRELESS 3945ABG/BG, 4965AGN (iwlegacy)
-M:     Stanislaw Gruszka <sgruszka@redhat.com>
+M:     Stanislaw Gruszka <stf_xl@wp.pl>
 L:     linux-wireless@vger.kernel.org
 S:     Supported
 F:     drivers/net/wireless/intel/iwlegacy/
@@ -9132,7 +9171,7 @@ F:        arch/x86/include/uapi/asm/svm.h
 F:     arch/x86/include/asm/kvm*
 F:     arch/x86/include/asm/pvclock-abi.h
 F:     arch/x86/include/asm/svm.h
-F:     arch/x86/include/asm/vmx.h
+F:     arch/x86/include/asm/vmx*.h
 F:     arch/x86/kernel/kvm.c
 F:     arch/x86/kernel/kvmclock.c
 
@@ -9889,7 +9928,7 @@ S:        Maintained
 F:     drivers/net/dsa/mv88e6xxx/
 F:     include/linux/platform_data/mv88e6xxx.h
 F:     Documentation/devicetree/bindings/net/dsa/marvell.txt
-F:     Documentation/networking/devlink-params-mv88e6xxx.txt
+F:     Documentation/networking/devlink/mv88e6xxx.rst
 
 MARVELL ARMADA DRM SUPPORT
 M:     Russell King <linux@armlinux.org.uk>
@@ -9959,8 +9998,7 @@ F:        drivers/net/ethernet/marvell/mvneta.*
 
 MARVELL MWIFIEX WIRELESS DRIVER
 M:     Amitkumar Karwar <amitkarwar@gmail.com>
-M:     Nishant Sarmukadam <nishants@marvell.com>
-M:     Ganapathi Bhat <gbhat@marvell.com>
+M:     Ganapathi Bhat <ganapathi.bhat@nxp.com>
 M:     Xinming Hu <huxinming820@gmail.com>
 L:     linux-wireless@vger.kernel.org
 S:     Maintained
@@ -9999,6 +10037,16 @@ M:      Jerin Jacob <jerinj@marvell.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/marvell/octeontx2/af/
+F:     Documentation/networking/device_drivers/marvell/octeontx2.rst
+
+MARVELL OCTEONTX2 PHYSICAL FUNCTION DRIVER
+M:     Sunil Goutham <sgoutham@marvell.com>
+M:     Geetha sowjanya <gakula@marvell.com>
+M:     Subbaraya Sundeep <sbhatta@marvell.com>
+M:     hariprasad <hkelam@marvell.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     drivers/net/ethernet/marvell/octeontx2/nic/
 
 MATROX FRAMEBUFFER DRIVER
 L:     linux-fbdev@vger.kernel.org
@@ -11143,6 +11191,13 @@ S:     Maintained
 F:     Documentation/driver-api/serial/moxa-smartio.rst
 F:     drivers/tty/mxser.*
 
+MONOLITHIC POWER SYSTEM PMIC DRIVER
+M:     Saravanan Sekar <sravanhome@gmail.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/regulator/mpq7920.yaml
+F:     drivers/regulator/mpq7920.c
+F:     drivers/regulator/mpq7920.h
+
 MR800 AVERMEDIA USB FM RADIO DRIVER
 M:     Alexey Klimov <klimov.linux@gmail.com>
 L:     linux-media@vger.kernel.org
@@ -11386,7 +11441,7 @@ F:      Documentation/networking/net_failover.rst
 
 NETEM NETWORK EMULATOR
 M:     Stephen Hemminger <stephen@networkplumber.org>
-L:     netem@lists.linux-foundation.org (moderated for non-subscribers)
+L:     netdev@vger.kernel.org
 S:     Maintained
 F:     net/sched/sch_netem.c
 
@@ -11431,7 +11486,7 @@ F:      include/uapi/linux/netrom.h
 F:     net/netrom/
 
 NETRONOME ETHERNET DRIVERS
-M:     Jakub Kicinski <jakub.kicinski@netronome.com>
+M:     Jakub Kicinski <kuba@kernel.org>
 L:     oss-drivers@netronome.com
 S:     Maintained
 F:     drivers/net/ethernet/netronome/
@@ -11460,8 +11515,8 @@ M:      "David S. Miller" <davem@davemloft.net>
 L:     netdev@vger.kernel.org
 W:     http://www.linuxfoundation.org/en/Net
 Q:     http://patchwork.ozlabs.org/project/netdev/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
 S:     Odd Fixes
 F:     Documentation/devicetree/bindings/net/
 F:     drivers/net/
@@ -11499,11 +11554,12 @@ F:    drivers/net/dsa/
 
 NETWORKING [GENERAL]
 M:     "David S. Miller" <davem@davemloft.net>
+M:     Jakub Kicinski <kuba@kernel.org>
 L:     netdev@vger.kernel.org
 W:     http://www.linuxfoundation.org/en/Net
 Q:     http://patchwork.ozlabs.org/project/netdev/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
 B:     mailto:netdev@vger.kernel.org
 S:     Maintained
 F:     net/
@@ -11548,7 +11604,7 @@ M:      "David S. Miller" <davem@davemloft.net>
 M:     Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
 M:     Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
 L:     netdev@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
 S:     Maintained
 F:     net/ipv4/
 F:     net/ipv6/
@@ -11573,6 +11629,18 @@ F:     net/ipv6/calipso.c
 F:     net/netfilter/xt_CONNSECMARK.c
 F:     net/netfilter/xt_SECMARK.c
 
+NETWORKING [MPTCP]
+M:     Mat Martineau <mathew.j.martineau@linux.intel.com>
+M:     Matthieu Baerts <matthieu.baerts@tessares.net>
+L:     netdev@vger.kernel.org
+L:     mptcp@lists.01.org
+W:     https://github.com/multipath-tcp/mptcp_net-next/wiki
+B:     https://github.com/multipath-tcp/mptcp_net-next/issues
+S:     Maintained
+F:     include/net/mptcp.h
+F:     net/mptcp/
+F:     tools/testing/selftests/net/mptcp/
+
 NETWORKING [TCP]
 M:     Eric Dumazet <edumazet@google.com>
 L:     netdev@vger.kernel.org
@@ -11591,7 +11659,7 @@ M:      Boris Pismenny <borisp@mellanox.com>
 M:     Aviad Yehezkel <aviadye@mellanox.com>
 M:     John Fastabend <john.fastabend@gmail.com>
 M:     Daniel Borkmann <daniel@iogearbox.net>
-M:     Jakub Kicinski <jakub.kicinski@netronome.com>
+M:     Jakub Kicinski <kuba@kernel.org>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     net/tls/*
@@ -11603,7 +11671,7 @@ L:      linux-wireless@vger.kernel.org
 Q:     http://patchwork.kernel.org/project/linux-wireless/list/
 
 NETDEVSIM
-M:     Jakub Kicinski <jakub.kicinski@netronome.com>
+M:     Jakub Kicinski <kuba@kernel.org>
 S:     Maintained
 F:     drivers/net/netdevsim/*
 
@@ -11680,7 +11748,7 @@ F:      Documentation/scsi/NinjaSCSI.txt
 F:     drivers/scsi/nsp32*
 
 NIOS2 ARCHITECTURE
-M:     Ley Foon Tan <lftan@altera.com>
+M:     Ley Foon Tan <ley.foon.tan@intel.com>
 L:     nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
 S:     Maintained
@@ -12431,7 +12499,7 @@ L:      linux-crypto@vger.kernel.org
 S:     Maintained
 F:     kernel/padata.c
 F:     include/linux/padata.h
-F:     Documentation/padata.txt
+F:     Documentation/core-api/padata.rst
 
 PAGE POOL
 M:     Jesper Dangaard Brouer <hawk@kernel.org>
@@ -12564,7 +12632,7 @@ F:      Documentation/devicetree/bindings/pci/aardvark-pci.txt
 F:     drivers/pci/controller/pci-aardvark.c
 
 PCI DRIVER FOR ALTERA PCIE IP
-M:     Ley Foon Tan <lftan@altera.com>
+M:     Ley Foon Tan <ley.foon.tan@intel.com>
 L:     rfi@lists.rocketboards.org (moderated for non-subscribers)
 L:     linux-pci@vger.kernel.org
 S:     Supported
@@ -12743,7 +12811,7 @@ S:      Supported
 F:     Documentation/PCI/pci-error-recovery.rst
 
 PCI MSI DRIVER FOR ALTERA MSI IP
-M:     Ley Foon Tan <lftan@altera.com>
+M:     Ley Foon Tan <ley.foon.tan@intel.com>
 L:     rfi@lists.rocketboards.org (moderated for non-subscribers)
 L:     linux-pci@vger.kernel.org
 S:     Supported
@@ -13144,6 +13212,11 @@ S:     Maintained
 F:     drivers/iio/chemical/pms7003.c
 F:     Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.yaml
 
+PLX DMA DRIVER
+M:     Logan Gunthorpe <logang@deltatee.com>
+S:     Maintained
+F:     drivers/dma/plx_dma.c
+
 PMBUS HARDWARE MONITORING DRIVERS
 M:     Guenter Roeck <linux@roeck-us.net>
 L:     linux-hwmon@vger.kernel.org
@@ -13214,6 +13287,8 @@ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 S:     Maintained
 F:     fs/timerfd.c
 F:     include/linux/timer*
+F:     include/linux/time_namespace.h
+F:     kernel/time_namespace.c
 F:     kernel/time/*timer*
 
 POWER MANAGEMENT CORE
@@ -13649,6 +13724,13 @@ T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
 S:     Supported
 F:     drivers/net/wireless/ath/ath10k/
 
+QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
+M:     Kalle Valo <kvalo@codeaurora.org>
+L:     ath11k@lists.infradead.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
+S:     Supported
+F:     drivers/net/wireless/ath/ath11k/
+
 QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
 M:     QCA ath9k Development <ath9k-devel@qca.qualcomm.com>
 L:     linux-wireless@vger.kernel.org
@@ -13671,6 +13753,14 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/opp/qcom-nvmem-cpufreq.txt
 F:     drivers/cpufreq/qcom-cpufreq-nvmem.c
 
+QUALCOMM CORE POWER REDUCTION (CPR) AVS DRIVER
+M:     Niklas Cassel <nks@flawful.org>
+L:     linux-pm@vger.kernel.org
+L:     linux-arm-msm@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/power/avs/qcom,cpr.txt
+F:     drivers/power/avs/qcom-cpr.c
+
 QUALCOMM EMAC GIGABIT ETHERNET DRIVER
 M:     Timur Tabi <timur@kernel.org>
 L:     netdev@vger.kernel.org
@@ -13679,7 +13769,6 @@ F:      drivers/net/ethernet/qualcomm/emac/
 
 QUALCOMM ETHQOS ETHERNET DRIVER
 M:     Vinod Koul <vkoul@kernel.org>
-M:     Niklas Cassel <niklas.cassel@linaro.org>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -13821,7 +13910,7 @@ S:      Maintained
 F:     arch/mips/ralink
 
 RALINK RT2X00 WIRELESS LAN DRIVER
-M:     Stanislaw Gruszka <sgruszka@redhat.com>
+M:     Stanislaw Gruszka <stf_xl@wp.pl>
 M:     Helmut Schaa <helmut.schaa@googlemail.com>
 L:     linux-wireless@vger.kernel.org
 S:     Maintained
@@ -14507,7 +14596,7 @@ F:      drivers/media/i2c/s5k5baf.c
 SAMSUNG S5P Security SubSystem (SSS) DRIVER
 M:     Krzysztof Kozlowski <krzk@kernel.org>
 M:     Vladimir Zapolskiy <vz@mleia.com>
-M:     Kamil Konieczny <k.konieczny@partner.samsung.com>
+M:     Kamil Konieczny <k.konieczny@samsung.com>
 L:     linux-crypto@vger.kernel.org
 L:     linux-samsung-soc@vger.kernel.org
 S:     Maintained
@@ -14549,8 +14638,6 @@ F:      include/linux/platform_data/spi-s3c64xx.h
 
 SAMSUNG SXGBE DRIVERS
 M:     Byungho An <bh74.an@samsung.com>
-M:     Girish K S <ks.giri@samsung.com>
-M:     Vipul Pandya <vipul.pandya@samsung.com>
 S:     Supported
 L:     netdev@vger.kernel.org
 F:     drivers/net/ethernet/samsung/sxgbe/
@@ -14821,6 +14908,7 @@ F:      include/uapi/linux/selinux_netlink.h
 F:     security/selinux/
 F:     scripts/selinux/
 F:     Documentation/admin-guide/LSM/SELinux.rst
+F:     Documentation/ABI/obsolete/sysfs-selinux-disable
 
 SENSABLE PHANTOM
 M:     Jiri Slaby <jirislaby@gmail.com>
@@ -15771,6 +15859,7 @@ M:      Jose Abreu <joabreu@synopsys.com>
 L:     netdev@vger.kernel.org
 W:     http://www.stlinux.com
 S:     Supported
+F:     Documentation/networking/device_drivers/stmicro/
 F:     drivers/net/ethernet/stmicro/stmmac/
 
 SUN3/3X
@@ -16604,7 +16693,7 @@ F:      kernel/time/ntp.c
 F:     tools/testing/selftests/timers/
 
 TIPC NETWORK LAYER
-M:     Jon Maloy <jon.maloy@ericsson.com>
+M:     Jon Maloy <jmaloy@redhat.com>
 M:     Ying Xue <ying.xue@windriver.com>
 L:     netdev@vger.kernel.org (core kernel code)
 L:     tipc-discussion@lists.sourceforge.net (user apps, general discussion)
@@ -17500,6 +17589,7 @@ F:      net/vmw_vsock/diag.c
 F:     net/vmw_vsock/af_vsock_tap.c
 F:     net/vmw_vsock/virtio_transport_common.c
 F:     net/vmw_vsock/virtio_transport.c
+F:     net/vmw_vsock/vsock_loopback.c
 F:     drivers/net/vsockmon.c
 F:     drivers/vhost/vsock.c
 F:     tools/testing/vsock/
@@ -17870,6 +17960,14 @@ L:     linux-gpio@vger.kernel.org
 S:     Maintained
 F:     drivers/gpio/gpio-ws16c48.c
 
+WIREGUARD SECURE NETWORK TUNNEL
+M:     Jason A. Donenfeld <Jason@zx2c4.com>
+S:     Maintained
+F:     drivers/net/wireguard/
+F:     tools/testing/selftests/wireguard/
+L:     wireguard@lists.zx2c4.com
+L:     netdev@vger.kernel.org
+
 WISTRON LAPTOP BUTTON DRIVER
 M:     Miloslav Trmac <mitr@volny.cz>
 S:     Maintained
@@ -18045,7 +18143,7 @@ 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:     Jakub Kicinski <kuba@kernel.org>
 M:     Jesper Dangaard Brouer <hawk@kernel.org>
 M:     John Fastabend <john.fastabend@gmail.com>
 L:     netdev@vger.kernel.org
Unnamed repository; edit this file 'description' to name the repository.