From: David Howells <dhowells@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: dhowells@redhat.com, Al Viro <viro@ZenIV.linux.org.uk>,
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: Mon, 20 Jan 2025 09:21:46 +0000 [thread overview]
Message-ID: <987481.1737364906@warthog.procyon.org.uk> (raw)
In-Reply-To: <20250120104106.0d3e036a@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the vfs tree got a conflict in:
>
> fs/afs/dir.c
>
> between commit:
>
> 6dd80936618c ("afs: Use netfslib for directories")
>
> from the vfs-brauner tree and commit:
>
> 8281b27ee7ec ("afs_d_revalidate(): use stable name and parent inode passed by caller")
>
> from the vfs tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
That looks correct.
Acked-by: David Howells <dhowells@redhat.com>
next prev parent reply other threads:[~2025-01-20 9:21 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-19 23:41 linux-next: manual merge of the vfs tree with the vfs-brauner tree Stephen Rothwell
2025-01-20 9:21 ` David Howells [this message]
-- 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-07-07 23:38 Stephen Rothwell
2025-07-08 0:25 ` Al Viro
2025-07-08 0:45 ` Al Viro
2025-07-08 8:15 ` Christian Brauner
2025-05-16 0:02 Stephen Rothwell
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=987481.1737364906@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=brauner@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=viro@ZenIV.linux.org.uk \
/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