netdev - Re: pull request: bluetooth 2021-11-02

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] [day] [month] [year] [list]

Message-ID: <20211115135302.4ad246e7@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>
Date:   Mon, 15 Nov 2021 13:53:02 -0800
From:   Jakub Kicinski <kuba@...nel.org>
To:     Luiz Augusto von Dentz <luiz.dentz@...il.com>
Cc:     David Miller <davem@...emloft.net>,
        "linux-bluetooth@...r.kernel.org" <linux-bluetooth@...r.kernel.org>,
        "open list:NETWORKING [GENERAL]" <netdev@...r.kernel.org>
Subject: Re: pull request: bluetooth 2021-11-02

On Mon, 15 Nov 2021 13:40:30 -0800 Luiz Augusto von Dentz wrote:
> > > I guess these won't be able to be merged after all, is there a define
> > > process on how/when pull-request shall be sent to net-next, Ive assume
> > > next-next is freezed now the documentation says the the merge window
> > > lasts for approximately two weeks but I guess that is for the Linus
> > > tree not net-next?  
> >
> > I'm not sure what the exact rules are for net-next.
> >
> > We had some glitches this time around, IMHO. Here is what I have in
> > mind for the next merge window but note that I haven't had a chance
> > to discuss it with Dave yet, so it's more of me blabbering at this
> > point than a plan:
> >  - net-next would not apply patches posted after Linus cuts final;
> >  - make sure all trees feeding net-next submit their changes around
> >    rc6 time so that we don't get a large code dump right as the merge
> >    window opens;  
> 
> So net-next has a merge window open during the rc phase, until rc6? I
> assume if the rc goes further than rc7 it also would extend the merge
> window of net-next as well?

Yes, net-next has the inverse rules to Linus's tree basically. 
We accumulate the code outside the merge window. And then during
the merge window try to focus on fixes and conflicts introduced 
by merging with other -next trees outside networking.

> >  - any last minute net-next PRs should be ready by Monday night PST;
> >  - we'd give the tree one day to settle, have build issues reported etc
> >    and submit PR on Wednesday.
> >
> > If we go with a more structured timeline along these lines I'll try
> > to send reminders.  
> 
> +1, that would be great to have reminders for the merge window
> open/close that way if for some reason if you guys decide to change
> your merge window that would be noticed by us.