]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 949ca6b 61e7113)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
authorDavid S. Miller <davem@davemloft.net>
Fri, 2 Oct 2020 20:16:15 +0000 (13:16 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 2 Oct 2020 20:16:15 +0000 (13:16 -0700)
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>
1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
net/netlink/af_netlink.c patch | diff1 | diff2 | blob | history
tools/testing/selftests/net/Makefile patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc net/netlink/af_netlink.c
Simple merge
diff --cc tools/testing/selftests/net/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.