* linux-next: manual merge of the fuse tree with the mm-unstable tree
@ 2025-05-14 0:53 Stephen Rothwell
2025-06-02 23:02 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2025-05-14 0:53 UTC (permalink / raw)
To: Miklos Szeredi, Andrew Morton
Cc: Joanne Koong, Kairui Song, Linux Kernel Mailing List,
Linux Next Mailing List, Miklos Szeredi
[-- Attachment #1: Type: text/plain, Size: 1344 bytes --]
Hi all,
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.
--
Cheers,
Stephen Rothwell
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? */
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the fuse tree with the mm-unstable tree
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
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2025-06-02 23:02 UTC (permalink / raw)
To: Miklos Szeredi
Cc: Andrew Morton, Joanne Koong, Kairui Song,
Linux Kernel Mailing List, Linux Next Mailing List,
Miklos Szeredi
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the fuse tree with the mm-unstable tree
@ 2025-05-09 0:57 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2025-05-09 0:57 UTC (permalink / raw)
To: Miklos Szeredi, Andrew Morton
Cc: Joanne Koong, Kairui Song, Linux Kernel Mailing List,
Linux Next Mailing List, Miklos Szeredi
[-- Attachment #1: Type: text/plain, Size: 1268 bytes --]
Hi all,
Today's linux-next merge of the fuse tree got a conflict in:
fs/fuse/file.c
between commit:
47fa73bbc9d5 ("fuse: drop usage of folio_index")
from the mm-unstable tree and commit:
0c58a97f919c ("fuse: remove tmp folio for writebacks and internal rb tree")
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.
--
Cheers,
Stephen Rothwell
diff --cc fs/fuse/file.c
index 6f19a4daa559,e203dd4fcc0f..000000000000
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@@ -2349,7 -2091,7 +2091,7 @@@ static bool fuse_writepage_need_send(st
return true;
/* Discontinuity */
- if (data->orig_folios[ap->num_folios - 1]->index + 1 != folio->index)
- if (ap->folios[ap->num_folios - 1]->index + 1 != folio_index(folio))
++ if (ap->folios[ap->num_folios - 1]->index + 1 != folio->index)
return true;
/* Need to grow the pages array? If so, did the expansion fail? */
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-06-02 23:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
-- strict thread matches above, loose matches on Subject: below --
2025-05-09 0:57 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox