Hi all,
Today's linux-next merge of the ipsec tree got conflicts in:
net/ipv4/ip_vti.c
net/ipv6/ip6_vti.c
between commit:
4372339efc06 ("net: always use icmp{,v6}_ndo_send from ndo_start_xmit")
from the net tree and commits:
c7c1abfd6d42 ("vti: fix ipv4 pmtu check to honor ip header d
Hi Petr,
On Tue, 27 Mar 2018 17:33:43 +0300 Petr Machata wrote:
>
> Hi, this conflict needs to be resolved differently. Below I'm adding a
> patch on top of linux-next. Squash or apply as you see fit.
>
> What's the right way to proceed from here? It looks to me like Stefano
> or Steffen should
On Tue, 27 Mar 2018 17:33:43 +0300
Petr Machata wrote:
> Hi, this conflict needs to be resolved differently. Below I'm adding a
> patch on top of linux-next. Squash or apply as you see fit.
Petr, thanks for spotting this. Stephen, you can carry these tags for
Petr's patch:
Fixes: adab890d00dc (
Stephen Rothwell writes:
> Hi Steffen,
>
> Today's linux-next merge of the ipsec tree got a conflict in:
>
> net/ipv4/ip_tunnel.c
>
> between commit:
>
> f6cc9c054e77 ("ip_tunnel: Emit events for post-register MTU changes")
>
> from the net tree and commit:
>
> 24fc79798b8d ("ip_tunnel: Cla
Hi Steffen,
Today's linux-next merge of the ipsec tree got a conflict in:
net/ipv4/ip_tunnel.c
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
