Re: linux-next: manual merge of the net-next tree with the net tree
From: Petr Machata <hidden>
Date: 2018-02-28 09:47:07
Also in:
lkml, netdev
Possibly related (same subject, not in this thread)
- 2026-04-14 · Re: linux-next: manual merge of the net-next tree with the net tree · Jesper Dangaard Brouer <hawk@kernel.org>
- 2026-04-13 · linux-next: manual merge of the net-next tree with the net tree · Mark Brown <broonie@kernel.org>
- 2026-04-06 · linux-next: manual merge of the net-next tree with the net tree · Mark Brown <broonie@kernel.org>
- 2026-03-16 · linux-next: manual merge of the net-next tree with the net tree · Mark Brown <broonie@kernel.org>
- 2026-03-12 · linux-next: manual merge of the net-next tree with the net tree · Mark Brown <broonie@kernel.org>
Stephen Rothwell [off-list ref] 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