From: David S. Miller Date: Fri, 6 Sep 2019 13:09:16 +0000 (+0200) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec X-Git-Tag: v5.3~5^2~36 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e9550ed67cc861e6607d63e7d1036dce28f4902;p=thirdparty%2Flinux.git Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec Steffen Klassert says: ==================== pull request (net): ipsec 2019-09-05 1) Several xfrm interface fixes from Nicolas Dichtel: - Avoid an interface ID corruption on changelink. - Fix wrong intterface names in the logs. - Fix a list corruption when changing network namespaces. - Fix unregistation of the underying phydev. 2) Fix a potential warning when merging xfrm_plocy nodes. From Florian Westphal. Please pull or let me know if there are problems. ==================== Signed-off-by: David S. Miller --- 2e9550ed67cc861e6607d63e7d1036dce28f4902