* linux-next: manual merge of the sysctl tree with the mm tree
@ 2025-03-11 9:21 Stephen Rothwell
2025-03-27 23:37 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2025-03-11 9:21 UTC (permalink / raw)
To: Luis Chamberlain, Kees Cook, Joel Granados, Andrew Morton
Cc: Kaixiong Yu, Linux Kernel Mailing List, Linux Next Mailing List,
Mike Rapoport (Microsoft)
[-- Attachment #1: Type: text/plain, Size: 1099 bytes --]
Hi all,
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.
--
Cheers,
Stephen Rothwell
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);
[-- 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 sysctl tree with the mm tree
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
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2025-03-27 23:37 UTC (permalink / raw)
To: Andrew Morton
Cc: Luis Chamberlain, Kees Cook, Joel Granados, Kaixiong Yu,
Linux Kernel Mailing List, Linux Next Mailing List,
Mike Rapoport (Microsoft)
[-- 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-03-27 23:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox