]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ab4e5f4 07144b1)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/
authorDavid S. Miller <davem@davemloft.net>
Sat, 19 Mar 2022 14:49:08 +0000 (14:49 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 19 Mar 2022 14:49:08 +0000 (14:49 +0000)
commitcf22b72d58802b0ca7cec1b43bfa37e3bacb8c3e
tree059c5b7c8389ee1251c95054ac85e074e352ad8btree | snapshot
parentab4e5f49f33668e0346e9f67325fcf12077406c0commit | diff
parent07144b13d9d582d9da9986fdbda9857f6b6bd872commit | 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 2022-03-19

1) Delete duplicated functions that calls same xfrm_api_check.
   From Leon Romanovsky.

2) Align userland API of the default policy structure to the
   internal structures. From Nicolas Dichtel.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/xfrm.h diff1 | diff2 | blob | history
net/xfrm/xfrm_device.c diff1 | diff2 | blob | history
net/xfrm/xfrm_policy.c diff1 | diff2 | blob | history
net/xfrm/xfrm_user.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.