From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: Christian Brauner <brauner@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
"jianyun.gao" <jianyungao89@gmail•com>
Subject: Re: linux-next: manual merge of the vfs-brauner tree with the mm-stable tree
Date: Wed, 3 Dec 2025 13:33:55 +1100 [thread overview]
Message-ID: <20251203133355.03bcd090@canb.auug.org.au> (raw)
In-Reply-To: <20251125122934.36f75838@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1470 bytes --]
Hi all,
On Tue, 25 Nov 2025 12:29:34 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
>
> mm/secretmem.c
>
> between commit:
>
> b6c46600bfb2 ("mm: fix some typos in mm module")
>
> from the mm-stable tree and commit:
>
> 1011f385f492 ("secretmem: convert memfd_secret() to FD_ADD()")
>
> from the vfs-brauner 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/secretmem.c
> index 37f6d1097853,f0ef4e198884..000000000000
> --- a/mm/secretmem.c
> +++ b/mm/secretmem.c
> @@@ -224,10 -224,7 +224,7 @@@ err_free_inode
>
> SYSCALL_DEFINE1(memfd_secret, unsigned int, flags)
> {
> - struct file *file;
> - int fd, err;
> -
> - /* make sure local flags do not confict with global fcntl.h */
> + /* make sure local flags do not conflict with global fcntl.h */
> BUILD_BUG_ON(SECRETMEM_FLAGS_MASK & O_CLOEXEC);
>
> if (!secretmem_enable || !can_set_direct_map())
This is now a conflict between the mm-stable 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-12-03 2:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-25 1:29 linux-next: manual merge of the vfs-brauner tree with the mm-stable tree Stephen Rothwell
2025-12-03 2:33 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-12-20 23:52 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=20251203133355.03bcd090@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=brauner@kernel$(echo .)org \
--cc=jianyungao89@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