diff options
| author | David S. Miller <davem@davemloft.net> | 2022-03-19 14:49:08 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-03-19 14:49:08 +0000 |
| commit | 62f65554f5cffb17234e2b267d6376efc561d1c0 (patch) | |
| tree | 059c5b7c8389ee1251c95054ac85e074e352ad8b /drivers/uio | |
| parent | d5f497b889794161facc1522d86720b587d1c0b7 (diff) | |
| parent | b58b1f563ab78955d37e9e43e02790a85c66ac05 (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>
Diffstat (limited to 'drivers/uio')
0 files changed, 0 insertions, 0 deletions