Thread (6 messages) flat view 6 messages, 2 authors, 2021-11-16

Re: pull request: bluetooth 2021-11-02

From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Date: 2021-11-15 22:45:00
Also in: linux-bluetooth

Hi Jakub,

On Mon, Nov 15, 2021 at 1:09 PM Jakub Kicinski [off-list ref] wrote:
On Mon, 15 Nov 2021 11:53:15 -0800 Luiz Augusto von Dentz wrote:
quoted
quoted
Any chance to get these changes in before the merge window closes?
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?
 - 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.

-- 
Luiz Augusto von Dentz
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help