Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley
        Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United
        Kingdom.
        Registered in England and Wales under Company Registration No. 3798903
From:   David Howells <dhowells@redhat.com>
In-Reply-To: <20221128104853.25665813@kernel.org>
References: <20221128104853.25665813@kernel.org> <20221123192335.119335ac@kernel.org> <166919798040.1256245.11495568684139066955.stgit@warthog.procyon.org.uk> <1869061.1669273688@warthog.procyon.org.uk>
To:     Jakub Kicinski <kuba@kernel.org>
Cc:     dhowells@redhat.com, netdev@vger.kernel.org,
        linux-afs@lists.infradead.org,
        Marc Dionne <marc.dionne@auristor.com>,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH net-next 00/13] rxrpc: Increasing SACK size and moving away from softirq, part 2
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <3477286.1669666594.1@warthog.procyon.org.uk>
Date:   Mon, 28 Nov 2022 20:16:34 +0000
Message-ID: <3477287.1669666594@warthog.procyon.org.uk>
Precedence: bulk

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