linux-kernel - Re: linux-next: Tree for Nov 2

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Fri, 2 Nov 2018 14:57:48 +0100
From:   Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        linux-kernel <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: Tree for Nov 2

On Fri, Nov 2, 2018 at 2:22 PM Stephen Rothwell <sfr@...b.auug.org.au> 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