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. Thanks! The following changes since commit 114a5c3240155fdb01bf821c9d326d7bb05bd464: Merge tag 'mlx5-fixes-2019-07-11' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux (2019-07-11 15:06:37 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git master for you to fetch changes up to 769a807d0b41df4201dbeb01c22eaeb3e5905532: xfrm: policy: avoid warning splat when merging nodes (2019-08-20 08:09:42 +0200) ---------------------------------------------------------------- Florian Westphal (1): xfrm: policy: avoid warning splat when merging nodes Nicolas Dichtel (4): xfrm interface: avoid corruption on changelink xfrm interface: ifname may be wrong in logs xfrm interface: fix list corruption for x-netns xfrm interface: fix management of phydev include/net/xfrm.h | 2 -- net/xfrm/xfrm_interface.c | 56 +++++++++++++----------------- net/xfrm/xfrm_policy.c | 6 ++-- tools/testing/selftests/net/xfrm_policy.sh | 7 ++++ 4 files changed, 36 insertions(+), 35 deletions(-)