From: David S. Miller Date: Wed, 18 May 2022 11:47:36 +0000 (+0100) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec X-Git-Tag: v5.18~19^2~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=089403a3f7d6132e6b8c699510ff66ae29149975;p=thirdparty%2Fkernel%2Fstable.git 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 --- 089403a3f7d6132e6b8c699510ff66ae29149975