diff options
-rw-r--r-- | .mailmap | 1 | ||||
-rw-r--r-- | CREDITS | 8 | ||||
-rw-r--r-- | MAINTAINERS | 4 |
3 files changed, 10 insertions, 3 deletions
@@ -214,6 +214,7 @@ Jisheng Zhang <[email protected]> <[email protected]> Jisheng Zhang <[email protected]> <[email protected]> Johan Hovold <[email protected]> <[email protected]> Johan Hovold <[email protected]> <[email protected]> +John Crispin <[email protected]> <[email protected]> John Paul Adrian Glaubitz <[email protected]> John Stultz <[email protected]> Jordan Crouse <[email protected]> <[email protected]> @@ -1173,6 +1173,10 @@ D: Future Domain TMC-16x0 SCSI driver (author) D: APM driver (early port) D: DRM drivers (author of several) +N: Veaceslav Falico +D: Co-maintainer and co-author of the network bonding driver. + N: János Farkas D: romfs, various (mostly networking) fixes @@ -4179,6 +4183,10 @@ S: B-1206 Jingmao Guojigongyu S: 16 Baliqiao Nanjie, Beijing 101100 S: People's Repulic of China +N: Vlad Yasevich +D: SCTP protocol maintainer. + N: Aviad Yehezkel D: Kernel TLS implementation and offload support. diff --git a/MAINTAINERS b/MAINTAINERS index 7c884556eb8e..6f22075603cc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3766,7 +3766,6 @@ F: net/bluetooth/ BONDING DRIVER M: Jay Vosburgh <[email protected]> -M: Veaceslav Falico <[email protected]> M: Andy Gospodarek <[email protected]> S: Supported @@ -14599,7 +14598,6 @@ F: tools/testing/selftests/net/ipsec.c NETWORKING [IPv4/IPv6] M: "David S. Miller" <[email protected]> -M: Hideaki YOSHIFUJI <[email protected]> M: David Ahern <[email protected]> S: Maintained @@ -18681,9 +18679,9 @@ F: drivers/target/ F: include/target/ SCTP PROTOCOL -M: Vlad Yasevich <[email protected]> M: Neil Horman <[email protected]> M: Marcelo Ricardo Leitner <[email protected]> +M: Xin Long <[email protected]> S: Maintained W: http://lksctp.sourceforge.net |