Re: linux-next: manual merge of the tip tree with the net-next tree

From: Stephen Rothwell
Date: Sat Nov 04 2017 - 22:12:49 EST


Hi Alexei,

On Wed, 1 Nov 2017 09:27:14 -0700 Alexei Starovoitov <alexei.starovoitov@xxxxxxxxx> wrote:
>
> Also what do you mean by "same patch != same commit" ?
> Like if we had pushed to some 3rd tree first and then pulled
> into tip and net-next it would have been better?

Well, it would not have caused a conflict.
--
Cheers,
Stephen Rothwell