aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CREDITS7
-rw-r--r--MAINTAINERS1
2 files changed, 7 insertions, 1 deletions
diff --git a/CREDITS b/CREDITS
index a357f9cbb05d..a687c3c35c4c 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3222,6 +3222,10 @@ D: AIC5800 IEEE 1394, RAW I/O on 1394
D: Starter of Linux1394 effort
S: ask per mail for current address
+N: Boris Pismenny
+D: Kernel TLS implementation and offload support.
+
N: Nicolas Pitre
D: StrongARM SA1100 support integrator & hacker
@@ -4168,6 +4172,9 @@ S: 1513 Brewster Dr.
S: Carrollton, TX 75010
S: USA
+N: Dave Watson
+D: Kernel TLS implementation.
+
N: Tim Waugh
D: Co-architect of the parallel-port sharing system
diff --git a/MAINTAINERS b/MAINTAINERS
index 2720544cd91f..1897d8b45df4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -17818,7 +17818,6 @@ F: net/ipv6/syncookies.c
F: net/ipv6/tcp*.c
NETWORKING [TLS]
-M: Boris Pismenny <[email protected]>
M: John Fastabend <[email protected]>
M: Jakub Kicinski <[email protected]>