Hi Sinan, On Tue, 5 Sep 2017 18:54:38 -0400 Sinan Kaya <ok...@codeaurora.org> wrote: > > On 9/4/2017 12:54 AM, Stephen Rothwell wrote: > > Just a reminder that this conflict still exists. > > I suppose this was a message for Bjorn, right?
Correct. It was just a reminder that he may have to tell Linus about the conflict when he asks Linus to merge his tree (depending on how complex the conflict is and if he gets in before Dave gets the net-next tree merged). -- Cheers, Stephen Rothwell
