linux-kernel - Re: [PATCH net-next 00/13] rxrpc: Increasing SACK size and moving away from softirq, part 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]

Message-ID: <3477287.1669666594@warthog.procyon.org.uk>
Date:   Mon, 28 Nov 2022 20:16:34 +0000
From:   David Howells <dhowells@...hat.com>
To:     Jakub Kicinski <kuba@...nel.org>
Cc:     dhowells@...hat.com, netdev@...r.kernel.org,
        linux-afs@...ts.infradead.org,
        Marc Dionne <marc.dionne@...istor.com>,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH net-next 00/13] rxrpc: Increasing SACK size and moving away from softirq, part 2

Jakub Kicinski <kuba@...nel.org> 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