diff options
author | Paul Moore <paul@paul-moore.com> | 2017-08-10 15:00:58 -0400 |
---|---|---|
committer | Paul Moore <paul@paul-moore.com> | 2017-08-10 15:00:58 -0400 |
commit | 5703ffaa001d3a195f895f3975803464bc23b571 (patch) | |
tree | fcb96899d1dc8991e1aa55f49077a82ea394232b /MAINTAINERS | |
parent | 476accbe2f6ef69caeebe99f52a286e12ac35aee (diff) |
MAINTAINERS: update the NetLabel and Labeled Networking information
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 65990909fe73..be25ebaaeec3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -9112,15 +9112,6 @@ F: net/*/netfilter/ | |||
9112 | F: net/netfilter/ | 9112 | F: net/netfilter/ |
9113 | F: net/bridge/br_netfilter*.c | 9113 | F: net/bridge/br_netfilter*.c |
9114 | 9114 | ||
9115 | NETLABEL | ||
9116 | M: Paul Moore <paul@paul-moore.com> | ||
9117 | W: http://netlabel.sf.net | ||
9118 | L: netdev@vger.kernel.org | ||
9119 | S: Maintained | ||
9120 | F: Documentation/netlabel/ | ||
9121 | F: include/net/netlabel.h | ||
9122 | F: net/netlabel/ | ||
9123 | |||
9124 | NETROM NETWORK LAYER | 9115 | NETROM NETWORK LAYER |
9125 | M: Ralf Baechle <ralf@linux-mips.org> | 9116 | M: Ralf Baechle <ralf@linux-mips.org> |
9126 | L: linux-hams@vger.kernel.org | 9117 | L: linux-hams@vger.kernel.org |
@@ -9248,10 +9239,23 @@ F: net/ipv6/ | |||
9248 | F: include/net/ip* | 9239 | F: include/net/ip* |
9249 | F: arch/x86/net/* | 9240 | F: arch/x86/net/* |
9250 | 9241 | ||
9251 | NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK) | 9242 | NETWORKING [LABELED] (NetLabel, Labeled IPsec, SECMARK) |
9252 | M: Paul Moore <paul@paul-moore.com> | 9243 | M: Paul Moore <paul@paul-moore.com> |
9244 | W: https://github.com/netlabel | ||
9253 | L: netdev@vger.kernel.org | 9245 | L: netdev@vger.kernel.org |
9246 | L: linux-security-module@vger.kernel.org | ||
9254 | S: Maintained | 9247 | S: Maintained |
9248 | F: Documentation/netlabel/ | ||
9249 | F: include/net/calipso.h | ||
9250 | F: include/net/cipso_ipv4.h | ||
9251 | F: include/net/netlabel.h | ||
9252 | F: include/uapi/linux/netfilter/xt_SECMARK.h | ||
9253 | F: include/uapi/linux/netfilter/xt_CONNSECMARK.h | ||
9254 | F: net/netlabel/ | ||
9255 | F: net/ipv4/cipso_ipv4.c | ||
9256 | F: net/ipv6/calipso.c | ||
9257 | F: net/netfilter/xt_CONNSECMARK.c | ||
9258 | F: net/netfilter/xt_SECMARK.c | ||
9255 | 9259 | ||
9256 | NETWORKING [TLS] | 9260 | NETWORKING [TLS] |
9257 | M: Ilya Lesokhin <ilyal@mellanox.com> | 9261 | M: Ilya Lesokhin <ilyal@mellanox.com> |