summaryrefslogtreecommitdiff
path: root/kernel/sys_ni.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2022-05-18 12:47:36 +0100
committerDavid S. Miller <davem@davemloft.net>2022-05-18 12:47:36 +0100
commit089403a3f7d6132e6b8c699510ff66ae29149975 (patch)
tree006c70361939190e1a1dbf717fe48867e3e1808b /kernel/sys_ni.c
parent765d12160014613dec0a35f5b8f3134499699a55 (diff)
parent015c44d7bff3f44d569716117becd570c179ca32 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says: ==================== pull request (net): ipsec 2022-05-18 1) Fix "disable_policy" flag use when arriving from different devices. From Eyal Birger. 2) Fix error handling of pfkey_broadcast in function pfkey_process. From Jiasheng Jiang. 3) Check the encryption module availability consistency in pfkey. From Thomas Bartschies. Please pull or let me know if there are problems. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/sys_ni.c')
0 files changed, 0 insertions, 0 deletions