Re: [PATCH net-next 00/13] rxrpc: Increasing SACK size and moving away from softirq, part 2

From: David Howells
Date: Mon Nov 28 2022 - 15:17:58 EST


Jakub Kicinski <kuba@xxxxxxxxxx> wrote:

> On Thu, 24 Nov 2022 07:08:08 +0000 David Howells wrote:
> > What's the best way to base on a fix commit that's in net for patches in
> > net-next? Here I tried basing on a merge between them. Should I include
> > the fix patch on my net-next branch instead? Or will net be merged into
> > net-next at some point and I should wait for that?
>
> We merge net -> net-next each Thursday afternoon (LT / Linus Time)
> so if the wait is for something in net then we generally ask for folks
> to just hold off posting until the merge. If the dependency is the
> other way then just post based on what's in tree and provide the
> conflict resolution in the cover letter.

Ok. I guess last Thursday was skipped because of Thanksgiving.

David