summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-17 12:41:18 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-17 12:41:18 -0700
commit18673533256a2953ccefded52df2679de8640685 (patch)
treec1dcb3b173cb6032d3f9721e18a11ade346e17f6 /MAINTAINERS
parentccbfddb78c7bfdce442589ccce6d60f133251b9d (diff)
parent9f0d3c2781baa1102108e16efbe640dd74564a7c (diff)
downloadlinux-18673533256a2953ccefded52df2679de8640685.tar.gz
linux-18673533256a2953ccefded52df2679de8640685.tar.bz2
linux-18673533256a2953ccefded52df2679de8640685.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller: 1) Fix regression in /proc/net/if_inet6, sometimes devices do not get listed. From Eric Dumazet. 2) Add IPSEC networking sub-section to MAINTAINERS. 3) S390 networking fixes from Hendrik Brueckner and Stefan Raspl. 4) Fix enslavement of devices that can't do VLAN properly, from Jiri Pirko. 5) SCTP sack handling fix from Zijie Pan. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: ipv6: addrconf: fix /proc/net/if_inet6 bnx2x: fix handling mf storage modes qeth: fix deadlock between recovery and bonding driver smsgiucv: reestablish IUCV path after resume sctp: fix call to SCTP_CMD_PROCESS_SACK in sctp_cmd_interpreter() vlan: fix bond/team enslave of vlan challenged slave/port MAINTAINERS: Add explicit section for IPSEC networking.
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS14
1 files changed, 14 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index e39e9da359a0..41c53491db60 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5019,6 +5019,20 @@ F: net/ipv6/
F: include/net/ip*
F: arch/x86/net/*
+NETWORKING [IPSEC]
+M: Steffen Klassert <steffen.klassert@secunet.com>
+M: Herbert Xu <herbert@gondor.apana.org.au>
+M: "David S. Miller" <davem@davemloft.net>
+L: netdev@vger.kernel.org
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
+S: Maintained
+F: net/xfrm/
+F: net/key/
+F: net/ipv4/xfrm*
+F: net/ipv6/xfrm*
+F: include/uapi/linux/xfrm.h
+F: include/net/xfrm.h
+
NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK)
M: Paul Moore <paul@paul-moore.com>
L: netdev@vger.kernel.org