From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: Luis Chamberlain <mcgrof@kernel•org>, Kees Cook <kees@kernel•org>,
Joel Granados <joel.granados@kernel•org>,
Kaixiong Yu <yukaixiong@huawei•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
"Mike Rapoport (Microsoft)" <rppt@kernel•org>
Subject: Re: linux-next: manual merge of the sysctl tree with the mm tree
Date: Fri, 28 Mar 2025 10:37:52 +1100 [thread overview]
Message-ID: <20250328103752.114dc1d8@canb.auug.org.au> (raw)
In-Reply-To: <20250311202126.1150e018@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1329 bytes --]
Hi all,
On Tue, 11 Mar 2025 20:21:26 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the sysctl tree got a conflict in:
>
> include/linux/mm.h
>
> between commit:
>
> 61316cdc1915 ("arch, mm: introduce arch_mm_preinit")
>
> from the mm-unstable branch of the mm tree and commit:
>
> 73aa354af21d ("mm: filemap: move sysctl to mm/filemap.c")
>
> from the sysctl 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/mm.h
> index 4d32053c3d19,f5ba3ed8b44a..000000000000
> --- a/include/linux/mm.h
> +++ b/include/linux/mm.h
> @@@ -41,9 -40,6 +41,7 @@@ struct user_struct
> struct pt_regs;
> struct folio_batch;
>
> - extern int sysctl_page_lock_unfairness;
> -
> +void arch_mm_preinit(void);
> void mm_core_init(void);
> void init_mm_internals(void);
>
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-03-27 23:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-11 9:21 linux-next: manual merge of the sysctl tree with the mm tree Stephen Rothwell
2025-03-27 23:37 ` 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=20250328103752.114dc1d8@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=joel.granados@kernel$(echo .)org \
--cc=kees@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mcgrof@kernel$(echo .)org \
--cc=rppt@kernel$(echo .)org \
--cc=yukaixiong@huawei$(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