Re: [PATCH 00/13] vfs: recall-only directory delegations for knfsd

Jeff Layton <[email protected]>
Newsgroups org.kernel.vger.ecryptfs,dev.linux.lists.netfs,org.kernel.vger.linux-cifs,org.kernel.vger.linux-fsdevel,org.kernel.vger.linux-kernel,org.kernel.vger.linux-nfs,org.kernel.vger.linux-unionfs,org.kernel.vger.linux-xfs,org.kernel.vger.netdev
Message-ID <[email protected]>
On Mon, 2025-10-13 at 10:52 -0400, Chuck Lever wrote:
> On 10/13/25 10:47 AM, Jeff Layton wrote:
> > It would be great if we could get into linux-next soon so that it can be
> > merged for v6.19. Christian, could you pick up the vfs/filelock patches,
> > and Chuck pick up the nfsd patches?
> 
> Question about merge strategy:
> 
> Seems like I would have to base nfsd-testing (and nfsd-next) on
> Christian's tree, once the VFS changes are applied, for one or two of
> the NFSD patches to work. Yes?
> 

Correct. I think the usual way we've done this in the past is to have
Christian create a branch with just the vfs layer patches that you and
he can both pull into your -next branches.

-- 
Jeff Layton <[email protected]>
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.