From: Al Viro <viro@zeniv.linux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Christian Brauner <brauner@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 tree with the vfs-brauner tree
Date: Tue, 8 Jul 2025 01:45:50 +0100 [thread overview]
Message-ID: <20250708004550.GS1880847@ZenIV> (raw)
In-Reply-To: <20250708002509.GR1880847@ZenIV>
On Tue, Jul 08, 2025 at 01:25:09AM +0100, Al Viro wrote:
> Umm... Let's do it that way - fs/fhandle.c chunk of that commit is
> trivially split off and the rest should not conflict at all.
>
> Christian, would you mind throwing this on top of your vfs.pidfs? I'm dropping
> that part from my #work.misc commit...
Argh... Sorry, no go - that chunk needs to go before the rest of conversion
commit. Hmm...
See vfs/vfs.git #vfs-6.17.fs_struct; that branches off your "reflow" commit
and it merges clean with #vfs.all, AFAICS.
Are you OK with that variant? I've no strong preferences re branchpoints,
but some folks do - no idea if you have any policies in that respect.
If you don't have any problems with it, just merge it into #vfs.all
and I'll drop that commit from #work.misc
next prev parent reply other threads:[~2025-07-08 0:45 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-07 23:38 linux-next: manual merge of the vfs tree with the vfs-brauner tree Stephen Rothwell
2025-07-08 0:25 ` Al Viro
2025-07-08 0:45 ` Al Viro [this message]
2025-07-08 8:15 ` Christian Brauner
-- strict thread matches above, loose matches on Subject: below --
2026-04-08 12:43 Mark Brown
2026-04-08 17:16 ` Al Viro
2026-04-08 17:32 ` Mark Brown
2026-01-19 13:45 Mark Brown
2026-01-14 22:38 Stephen Rothwell
2025-11-20 21:47 Stephen Rothwell
2025-11-20 21:42 Stephen Rothwell
2025-11-20 21:33 Stephen Rothwell
2025-11-20 21:27 Stephen Rothwell
2025-09-25 12:35 Mark Brown
2025-09-24 9:04 Mark Brown
2025-09-24 8:58 Mark Brown
2025-09-22 8:58 Mark Brown
2025-09-04 23:48 Stephen Rothwell
2025-05-16 0:02 Stephen Rothwell
2025-01-19 23:41 Stephen Rothwell
2025-01-20 9:21 ` David Howells
2023-12-19 23:41 Stephen Rothwell
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=20250708004550.GS1880847@ZenIV \
--to=viro@zeniv.linux.org.uk \
--cc=brauner@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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