* linux-next: manual merge of the ext3 tree with the mm-stable tree
@ 2024-09-06 1:19 Stephen Rothwell
2024-09-22 22:33 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2024-09-06 1:19 UTC (permalink / raw)
To: Jan Kara, Andrew Morton
Cc: Josef Bacik, Linux Kernel Mailing List, Linux Next Mailing List,
Yafang Shao
[-- Attachment #1: Type: text/plain, Size: 1668 bytes --]
Hi all,
Today's linux-next merge of the fs-next tree got a conflict in:
mm/filemap.c
between commit:
0a2d82946be6 ("mm: allow read-ahead with IOCB_NOWAIT set")
from the mm-stable tree and commit:
d23805138ac0 ("fsnotify: generate pre-content permission event on page fault")
from the ext3 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 mm/filemap.c
index 4fdd2e49f9dc,b722ce0ca6c5..000000000000
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@@ -46,7 -46,7 +46,8 @@@
#include <linux/pipe_fs_i.h>
#include <linux/splice.h>
#include <linux/rcupdate_wait.h>
+#include <linux/sched/mm.h>
+ #include <linux/fsnotify.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
#include "internal.h"
@@@ -3303,8 -3391,17 +3407,19 @@@ vm_fault_t filemap_fault(struct vm_faul
if (unlikely(index >= max_idx))
return VM_FAULT_SIGBUS;
+ trace_mm_filemap_fault(mapping, index);
+
+ /*
+ * If we have pre-content watchers then we need to generate events on
+ * page fault so that we can populate any data before the fault.
+ */
+ ret = __filemap_fsnotify_fault(vmf, &fpin);
+ if (unlikely(ret)) {
+ if (fpin)
+ fput(fpin);
+ return ret;
+ }
+
/*
* Do we have something in the page cache already?
*/
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the ext3 tree with the mm-stable tree
2024-09-06 1:19 linux-next: manual merge of the ext3 tree with the mm-stable tree Stephen Rothwell
@ 2024-09-22 22:33 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2024-09-22 22:33 UTC (permalink / raw)
To: Jan Kara
Cc: Andrew Morton, Josef Bacik, Linux Kernel Mailing List,
Linux Next Mailing List, Yafang Shao
[-- Attachment #1: Type: text/plain, Size: 1922 bytes --]
Hi all,
On Fri, 6 Sep 2024 11:19:00 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the fs-next tree got a conflict in:
>
> mm/filemap.c
>
> between commit:
>
> 0a2d82946be6 ("mm: allow read-ahead with IOCB_NOWAIT set")
>
> from the mm-stable tree and commit:
>
> d23805138ac0 ("fsnotify: generate pre-content permission event on page fault")
>
> from the ext3 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 mm/filemap.c
> index 4fdd2e49f9dc,b722ce0ca6c5..000000000000
> --- a/mm/filemap.c
> +++ b/mm/filemap.c
> @@@ -46,7 -46,7 +46,8 @@@
> #include <linux/pipe_fs_i.h>
> #include <linux/splice.h>
> #include <linux/rcupdate_wait.h>
> +#include <linux/sched/mm.h>
> + #include <linux/fsnotify.h>
> #include <asm/pgalloc.h>
> #include <asm/tlbflush.h>
> #include "internal.h"
> @@@ -3303,8 -3391,17 +3407,19 @@@ vm_fault_t filemap_fault(struct vm_faul
> if (unlikely(index >= max_idx))
> return VM_FAULT_SIGBUS;
>
> + trace_mm_filemap_fault(mapping, index);
> +
> + /*
> + * If we have pre-content watchers then we need to generate events on
> + * page fault so that we can populate any data before the fault.
> + */
> + ret = __filemap_fsnotify_fault(vmf, &fpin);
> + if (unlikely(ret)) {
> + if (fpin)
> + fput(fpin);
> + return ret;
> + }
> +
> /*
> * Do we have something in the page cache already?
> */
This is now a conflict between the ext3 tree Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-09-22 22:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-06 1:19 linux-next: manual merge of the ext3 tree with the mm-stable tree Stephen Rothwell
2024-09-22 22:33 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox