diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-09-06 15:09:16 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-09-06 15:09:16 +0200 |
| commit | 2e9550ed67cc861e6607d63e7d1036dce28f4902 (patch) | |
| tree | 644091635a2b0ae76499534c0c4ba6f293da6ea0 /net/xfrm/xfrm_output.c | |
| parent | forcedeth: use per cpu to collect xmit/recv statistics (diff) | |
| parent | xfrm: policy: avoid warning splat when merging nodes (diff) | |
| download | linux-dev-2e9550ed67cc861e6607d63e7d1036dce28f4902.tar.xz linux-dev-2e9550ed67cc861e6607d63e7d1036dce28f4902.zip | |
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 <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/xfrm_output.c')
0 files changed, 0 insertions, 0 deletions