diff options
| author | David S. Miller <davem@davemloft.net> | 2018-03-29 10:12:47 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-29 10:12:47 -0400 |
| commit | 020295d95e13478ecbbbe2f44398ed4b4edb28df (patch) | |
| tree | a683dd5e1661c6e0a83622f69cfc60afd45133ab /net/9p | |
| parent | b9fc828debc8ac2bb21b5819a44d2aea456f1c95 (diff) | |
| parent | 9a3fb9fb84cc30577c1b012a6a3efda944684291 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
pull request (net): ipsec 2018-03-29
1) Fix a rcu_read_lock/rcu_read_unlock imbalance
in the error path of xfrm_local_error().
From Taehee Yoo.
2) Some VTI MTU fixes. From Stefano Brivio.
3) Fix a too early overwritten skb control buffer
on xfrm transport mode.
Please note that this pull request has a merge conflict
in net/ipv4/ip_tunnel.c.
The conflict is between
commit f6cc9c054e77 ("ip_tunnel: Emit events for post-register MTU changes")
from the net tree and
commit 24fc79798b8d ("ip_tunnel: Clamp MTU to bounds on new link")
from the ipsec tree.
It can be solved as it is currently done in linux-next.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/9p')
0 files changed, 0 insertions, 0 deletions