From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: Al Viro <viro@zeniv•linux.org.uk>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
wangzijie <wangzijie1@honor•com>
Subject: Re: linux-next: manual merge of the vfs tree with the mm-unstable tree
Date: Tue, 29 Jul 2025 11:42:49 +1000 [thread overview]
Message-ID: <20250729114249.2d2f4002@canb.auug.org.au> (raw)
In-Reply-To: <20250616105846.45af3a7b@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1360 bytes --]
Hi all,
On Mon, 16 Jun 2025 10:58:46 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the fs-next tree got a conflict in:
>
> include/linux/proc_fs.h
>
> between commit:
>
> e4cbb84d3ce3 ("proc: use the same treatment to check proc_lseek as ones for proc_read_iter et.al")
>
> from the mm-unstable tree and commit:
>
> 5943c611c47c ("procfs: kill ->proc_dops")
>
> from the fs-next 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 include/linux/proc_fs.h
> index 703d0c76cc9a,de1d24f19f76..000000000000
> --- a/include/linux/proc_fs.h
> +++ b/include/linux/proc_fs.h
> @@@ -27,7 -27,8 +27,9 @@@ enum
>
> PROC_ENTRY_proc_read_iter = 1U << 1,
> PROC_ENTRY_proc_compat_ioctl = 1U << 2,
> + PROC_ENTRY_proc_lseek = 1U << 3,
> +
> + PROC_ENTRY_FORCE_LOOKUP = 1U << 7,
> };
>
> struct proc_ops {
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 --]
prev parent reply other threads:[~2025-07-29 1:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-16 0:58 linux-next: manual merge of the vfs tree with the mm-unstable tree Stephen Rothwell
2025-07-29 1:42 ` 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=20250729114249.2d2f4002@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=viro@zeniv$(echo .)linux.org.uk \
--cc=wangzijie1@honor$(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