diff options
author | David S. Miller <davem@davemloft.net> | 2020-10-02 13:16:15 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-10-02 13:16:15 -0700 |
commit | c16bcd70a11b52d20877aa4e0b59285690a1b268 (patch) | |
tree | 8d79467b920406544c2f7d415e71c8441d647016 /MAINTAINERS | |
parent | 949ca6b82e43b342dba153a9fd643fb1b5e9f034 (diff) | |
parent | 61e7113e48d3ca1ea692b5c6376a4b545b312166 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:
====================
pull request (net-next): ipsec-next 2020-10-02
1) Add a full xfrm compatible layer for 32-bit applications on
64-bit kernels. From Dmitry Safonov.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c1e946606dce..8f1c9eb6a869 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12158,6 +12158,7 @@ F: net/ipv6/ipcomp6.c F: net/ipv6/xfrm* F: net/key/ F: net/xfrm/ +F: tools/testing/selftests/net/ipsec.c NETWORKING [IPv4/IPv6] M: "David S. Miller" <davem@davemloft.net> |