Re: linux-next: manual merge of the net-next tree with the net tree
From: Ido Schimmel
Date: Mon Dec 17 2018 - 05:03:23 EST
On Mon, Dec 17, 2018 at 11:31:06AM +1100, Stephen Rothwell wrote:
> Hi all,
> Today's linux-next merge of the net-next tree got a conflict in:
> between commit:
> 8203e2d844d3 ("net: clear skb->tstamp in forwarding paths")
> from the net tree and commit:
> f839a6c92504 ("net: Do not route unicast IP packets twice")
> from the net-next tree.
> I fixed it up (I was not quite sure of the correct ordering - see below)
> and can carry the fix as necessary. This is now fixed as far as linux-next
> is concerned, but any non trivial conflicts should be mentioned to your
> upstream maintainer when your tree is submitted for merging. You may
> also want to consider cooperating with the maintainer of the conflicting
> tree to minimise any particularly complex conflicts.
Looks good to me. Eric?