netdev - Re: merge window is open. bpf-next is still open.

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]

Message-ID: <fb8b825f-6a40-3f88-02bd-b9bb93e0f6e3@iogearbox.net>
Date:   Tue, 13 Oct 2020 00:42:12 +0200
From:   Daniel Borkmann <daniel@...earbox.net>
To:     Alexei Starovoitov <alexei.starovoitov@...il.com>,
        Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Jakub Kicinski <kuba@...nel.org>, bpf <bpf@...r.kernel.org>,
        Network Development <netdev@...r.kernel.org>,
        Kernel Team <Kernel-team@...com>,
        "David S. Miller" <davem@...emloft.net>
Subject: Re: merge window is open. bpf-next is still open.

On 10/12/20 11:03 PM, Alexei Starovoitov wrote:
> On Tue, Oct 13, 2020 at 07:50:16AM +1100, Stephen Rothwell wrote:
[...]
>> How about this: you create a for-next branch in the bpf-next tree and I
>> fetch that instead of your master branch.  What you do is always work
>> in your master branch and whenever it is "ready", you just merge master
>> into for-next and that is what linux-next works with (net-next still
>> merges your master branch as now).  So the for-next branch consists
>> only of consecutive merges of your master branch.
>>
>> During the merge window you do *not* merge master into for-next (and,
>> in fact, everything in for-next should have been merged into the
>> net-next tree anyway, right?) and then when -rc1 is released, you reset
>> for-next to -rc1 and start merging master into it again.
>>
>> This way the commit SHA1s are stable and I don't have to remember to
>> switch branches/trees every merge window (which I would forget
>> sometimes for sure :-)).
> 
> That is a great idea! I think that should work well for everyone.
> Let's do exactly that.
> Just pushed bpf-next/for-next branch.

+1, I like it as it keeps things simple & straight forward for contributors
and for linux-next as well.

Thanks,
Daniel