]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ac76013 d4f3e39)
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)
commit9114efebe7cc344dc311f12e4a3bf8184ced9312
tree059c5b7c8389ee1251c95054ac85e074e352ad8btree | snapshot
parentac760131215e1926a7fc63fa0de17b38133feb30commit | diff
parentd4f3e39623de3fa245c34b35e92db4bb21e224b6commit | 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.