summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-05-18 07:55:55 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-05-18 07:55:55 +0200
commit48a789079a146ecd916e29cc5e47410d9cb05fbe (patch)
tree04f890f10e9cbdd97b4bf72647656ec94cb8d51f /MAINTAINERS
parentusb: renesas-xhci: Add ROM loader for uPD720201 (diff)
parentLinux 5.7-rc6 (diff)
downloadlinux-48a789079a146ecd916e29cc5e47410d9cb05fbe.tar.xz
linux-48a789079a146ecd916e29cc5e47410d9cb05fbe.zip
Merge 5.7-rc6 into usb-next
We need the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS5
1 files changed, 4 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index f71212eb845e..2d5ac1b89ed3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11718,8 +11718,9 @@ F: net/core/drop_monitor.c
NETWORKING DRIVERS
M: "David S. Miller" <davem@davemloft.net>
+M: Jakub Kicinski <kuba@kernel.org>
L: netdev@vger.kernel.org
-S: Odd Fixes
+S: Maintained
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/netdev/net.git
@@ -14642,6 +14643,7 @@ F: drivers/iommu/s390-iommu.c
S390 IUCV NETWORK LAYER
M: Julian Wiedmann <jwi@linux.ibm.com>
+M: Karsten Graul <kgraul@linux.ibm.com>
M: Ursula Braun <ubraun@linux.ibm.com>
L: linux-s390@vger.kernel.org
S: Supported
@@ -14652,6 +14654,7 @@ F: net/iucv/
S390 NETWORK DRIVERS
M: Julian Wiedmann <jwi@linux.ibm.com>
+M: Karsten Graul <kgraul@linux.ibm.com>
M: Ursula Braun <ubraun@linux.ibm.com>
L: linux-s390@vger.kernel.org
S: Supported