From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Miklos Szeredi <miklos@szeredi•hu>
Cc: Andrew Morton <akpm@linux-foundation•org>,
Joanne Koong <joannelkoong@gmail•com>,
Kairui Song <kasong@tencent•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Miklos Szeredi <mszeredi@redhat•com>
Subject: Re: linux-next: manual merge of the fuse tree with the mm-unstable tree
Date: Tue, 3 Jun 2025 09:02:26 +1000 [thread overview]
Message-ID: <20250603090226.4bf0162e@canb.auug.org.au> (raw)
In-Reply-To: <20250514105313.5e2c367a@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1571 bytes --]
Hi all,
On Wed, 14 May 2025 10:53:13 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the fuse tree got a conflict in:
>
> fs/fuse/file.c
>
> between commit:
>
> 04a1473f8ff0 ("fuse: drop usage of folio_index")
>
> from the mm-unstable tree and commits:
>
> 0c58a97f919c ("fuse: remove tmp folio for writebacks and internal rb tree")
> 3a7d67252c63 ("fuse: support large folios for writeback")
>
> from the fuse 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.
>
>
> diff --cc fs/fuse/file.c
> index 6f19a4daa559,b27cdbd4bffe..000000000000
> --- a/fs/fuse/file.c
> +++ b/fs/fuse/file.c
> @@@ -2349,7 -2145,7 +2145,7 @@@ static bool fuse_writepage_need_send(st
> return true;
>
> /* Discontinuity */
> - if (data->orig_folios[ap->num_folios - 1]->index + 1 != folio->index)
> - if (folio_next_index(ap->folios[ap->num_folios - 1]) != folio_index(folio))
> ++ if (folio_next_index(ap->folios[ap->num_folios - 1]) != folio->index)
> return true;
>
> /* Need to grow the pages array? If so, did the expansion fail? */
This is now a conflict between the fuse tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2025-06-02 23:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-14 0:53 linux-next: manual merge of the fuse tree with the mm-unstable tree Stephen Rothwell
2025-06-02 23:02 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-05-09 0:57 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=20250603090226.4bf0162e@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=joannelkoong@gmail$(echo .)com \
--cc=kasong@tencent$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miklos@szeredi$(echo .)hu \
--cc=mszeredi@redhat$(echo .)com \
/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