From: Chuck Lever <chuck.lever@oracle•com>
To: Mark Brown <broonie@kernel•org>
Cc: Christian Brauner <brauner@kernel•org>,
Jeff Layton <jlayton@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the vfs-brauner tree with the nfsd tree
Date: Thu, 28 May 2026 11:34:24 -0400 [thread overview]
Message-ID: <755c76a3-fbc3-4e3b-85a2-8d90337a38ca@oracle.com> (raw)
In-Reply-To: <30d38675-a07e-4d7e-9365-f4b97a3e31ca@sirena.org.uk>
On 5/28/26 11:01 AM, Mark Brown wrote:
> On Thu, May 28, 2026 at 10:51:58AM -0400, Chuck Lever wrote:
>
>> 1. I might create my own merged branch that grabs only the three vfs.
>> branches I need. Cons: I've never done this before, I'm not certain
>> my tool chain (StGit) supports git merge, and it tangles the merge
>> graph even more than it already is.
>
> You could always create this independently of your usual tooling and use
> it as a base like something that someone else had created? I don't know
> StGit but I have similar stuff with my own tooling sometimes.
I've updated nfsd-next so it is based on a merge of the three
prerequisite vfs/ topic branches plus v7.1-rc5 using the mechanism you
suggested. Please give it a try.
--
Chuck Lever
next prev parent reply other threads:[~2026-05-28 15:35 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-28 14:28 linux-next: manual merge of the vfs-brauner tree with the nfsd tree Mark Brown
2026-05-28 14:51 ` Chuck Lever
2026-05-28 15:01 ` Mark Brown
2026-05-28 15:34 ` Chuck Lever [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-11-16 20:34 Stephen Rothwell
2025-12-02 23:11 ` Stephen Rothwell
2024-10-23 21:15 Stephen Rothwell
2024-02-07 0:41 Stephen Rothwell
2024-02-07 14:40 ` Chuck Lever
2024-02-07 14:58 ` Jeff Layton
2023-05-23 23:56 Stephen Rothwell
2023-05-24 9:08 ` Christian Brauner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=755c76a3-fbc3-4e3b-85a2-8d90337a38ca@oracle.com \
--to=chuck.lever@oracle$(echo .)com \
--cc=brauner@kernel$(echo .)org \
--cc=broonie@kernel$(echo .)org \
--cc=jlayton@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox