diff options
-rw-r--r-- | CREDITS | 24 | ||||
-rw-r--r-- | MAINTAINERS | 9 |
2 files changed, 25 insertions, 8 deletions
@@ -710,6 +710,10 @@ S: Las Cuevas 2385 - Bo Guemes S: Las Heras, Mendoza CP 5539 S: Argentina +N: Jay Cliburn +D: ATLX Ethernet drivers + N: Steven P. Cole @@ -1284,6 +1288,10 @@ D: Major kbuild rework during the 2.5 cycle D: ISDN Maintainer S: USA +N: Gerrit Renker +D: DCCP protocol support. + N: Philip Gladstone D: Kernel / timekeeping stuff @@ -2138,6 +2146,10 @@ E: [email protected] D: Original author of software suspend +N: Alexey Kuznetsov +D: Author and maintainer of large parts of the networking stack + N: Jaroslav Kysela W: https://www.perex.cz @@ -2696,6 +2708,10 @@ N: Wolfgang Muees D: Auerswald USB driver +N: Shrijeet Mukherjee +D: Network routing domains (VRF). + N: Paul Mundt D: SuperH maintainer @@ -4110,6 +4126,10 @@ S: B-1206 Jingmao Guojigongyu S: 16 Baliqiao Nanjie, Beijing 101100 S: People's Repulic of China +N: Aviad Yehezkel +D: Kernel TLS implementation and offload support. + N: Victor Yodaiken D: RTLinux (RealTime Linux) @@ -4167,6 +4187,10 @@ S: 1507 145th Place SE #B5 S: Bellevue, Washington 98007 S: USA +N: Wensong Zhang +D: IP virtual server (IPVS). + N: Haojian Zhuang D: MMP support diff --git a/MAINTAINERS b/MAINTAINERS index b15514a770e3..2a6dc5bfa08c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -820,7 +820,6 @@ M: Netanel Belgazal <[email protected]> M: Arthur Kiyanovski <[email protected]> R: Guy Tzalik <[email protected]> R: Saeed Bishara <[email protected]> -R: Zorik Machulsky <[email protected]> S: Supported F: Documentation/networking/device_drivers/ethernet/amazon/ena.rst @@ -2942,7 +2941,6 @@ S: Maintained F: drivers/hwmon/asus_atk0110.c ATLX ETHERNET DRIVERS -M: Jay Cliburn <[email protected]> M: Chris Snook <[email protected]> S: Maintained @@ -4922,9 +4920,8 @@ F: Documentation/scsi/dc395x.rst F: drivers/scsi/dc395x.* DCCP PROTOCOL -M: Gerrit Renker <[email protected]> -S: Maintained +S: Orphan W: http://www.linuxfoundation.org/collaborate/workgroups/networking/dccp F: include/linux/dccp.h F: include/linux/tfrc.h @@ -9327,7 +9324,6 @@ W: http://www.adaptec.com/ F: drivers/scsi/ips* IPVS -M: Wensong Zhang <[email protected]> M: Simon Horman <[email protected]> M: Julian Anastasov <[email protected]> @@ -12418,7 +12414,6 @@ F: tools/testing/selftests/net/ipsec.c NETWORKING [IPv4/IPv6] M: "David S. Miller" <[email protected]> -M: Alexey Kuznetsov <[email protected]> M: Hideaki YOSHIFUJI <[email protected]> S: Maintained @@ -12475,7 +12470,6 @@ F: net/ipv6/tcp*.c NETWORKING [TLS] M: Boris Pismenny <[email protected]> -M: Aviad Yehezkel <[email protected]> M: John Fastabend <[email protected]> M: Daniel Borkmann <[email protected]> M: Jakub Kicinski <[email protected]> @@ -19058,7 +19052,6 @@ K: regulator_get_optional VRF M: David Ahern <[email protected]> -M: Shrijeet Mukherjee <[email protected]> S: Maintained F: Documentation/networking/vrf.rst |