From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jan Kara <jack@suse•cz>
Cc: Andrew Morton <akpm@linux-foundation•org>,
Josef Bacik <josef@toxicpanda•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Yafang Shao <laoar.shao@gmail•com>
Subject: Re: linux-next: manual merge of the ext3 tree with the mm-stable tree
Date: Mon, 23 Sep 2024 08:33:14 +1000 [thread overview]
Message-ID: <20240923083314.7b750219@canb.auug.org.au> (raw)
In-Reply-To: <20240906111900.5fcf345e@canb.auug.org.au>
[-- 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 --]
prev parent reply other threads:[~2024-09-22 22:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
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=20240923083314.7b750219@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=jack@suse$(echo .)cz \
--cc=josef@toxicpanda$(echo .)com \
--cc=laoar.shao@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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