Re: linux-next: Tree for Nov 2

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, Nov 2, 2018 at 2:22 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Its always OK (and actually useful) to move your branch head up to
> where Linus merged it (this is usually a fast forward anyway) since
> that doesn't add any new code to linux-next to conflict with code that
> is still pending to be merged by Linus.
>
> Also, adding bug fixes is always fine.
>
> I just want to avoid getting conflicts in linux-next between code
> that Linus will merge during this merge window and new code destined
> for the next merge window.

Thanks Stephen! I assumed as much, but I doubted due to the warning
(and I wanted to avoid giving you an unexpected surprise tomorrow).

Cheers,
Miguel



[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux