Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
authorDavid S. Miller <davem@davemloft.net>
Wed, 18 May 2022 11:47:36 +0000 (12:47 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 May 2022 11:47:36 +0000 (12:47 +0100)
commit089403a3f7d6132e6b8c699510ff66ae29149975
tree006c70361939190e1a1dbf717fe48867e3e1808b
parent765d12160014613dec0a35f5b8f3134499699a55
parent015c44d7bff3f44d569716117becd570c179ca32
Merge branch 'master' of git://git./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>
net/ipv4/route.c