Messages in this thread | | | From | Petr Machata <> | Subject | Re: linux-next: manual merge of the net-next tree with the net tree | Date | Wed, 28 Feb 2018 11:46:44 +0200 |
| |
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Today's linux-next merge of the net-next tree got a conflict in: > > net/ipv4/ip_tunnel.c > > between commit: > > 4e994776e7bd ("ip_tunnel: Do not use mark in skb by default") > > from the net tree and commit: > > b0066da52ea5 ("ip_tunnel: Rename & publish init_tunnel_flow") > > from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary.
Looks good, thanks!
Petr
| |