git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d5f497b b58b1f5)
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)
commit62f65554f5cffb17234e2b267d6376efc561d1c0
tree059c5b7c8389ee1251c95054ac85e074e352ad8btree
parentd5f497b889794161facc1522d86720b587d1c0b7commit | diff
parentb58b1f563ab78955d37e9e43e02790a85c66ac05commit | diff
Merge branch 'master' of git://git./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
Unnamed repository; edit this file 'description' to name the repository.