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

Stephen Rothwell
2017-11-05T02:12:44Z

Hi Alexei,

On Wed, 1 Nov 2017 09:27:14 -0700 Alexei Starovoitov <alexei.starovoitov@gmail.com> 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