linux-kernel - Re: linux-next: manual merge of the sysctl tree with the tip tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <skkjdjse5q7wgwwfqzkgcfb7ewcrlsn7hbqmdf333bcwbbpgak@j4hwc7iidkqh>
Date: Thu, 27 Feb 2025 13:18:18 +0100
From: Joel Granados <joel.granados@...nel.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Luis Chamberlain <mcgrof@...nel.org>, Kees Cook <kees@...nel.org>, 
	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...hat.com>, "H. Peter Anvin" <hpa@...or.com>, 
	Peter Zijlstra <peterz@...radead.org>, Kaixiong Yu <yukaixiong@...wei.com>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the sysctl tree with the tip tree

On Mon, Feb 24, 2025 at 05:03:10PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the sysctl tree got a conflict in:
> 
>   kernel/sysctl.c
Yep, 8aeacf257070 got picked up by the tip robot. I was expecting a bit
more review before this went in, so I did not bother rebasing it on top
of next.

> 
> between commit:
> 
>   8aeacf257070 ("perf/core: Move perf_event sysctls into kernel/events")
> 
> from the tip tree and commit:
> 
>   dccf3c99febf ("sysctl: remove unneeded include")
> 
> from the sysctl tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
Thx for 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 kernel/sysctl.c
> index 635f5e829fe8,eeb4cba12190..000000000000
> --- a/kernel/sysctl.c
> +++ b/kernel/sysctl.c
> @@@ -54,7 -47,7 +47,6 @@@
>   #include <linux/acpi.h>
>   #include <linux/reboot.h>
>   #include <linux/ftrace.h>
> - #include <linux/oom.h>
>  -#include <linux/perf_event.h>
>   #include <linux/kmod.h>
>   #include <linux/capability.h>
>   #include <linux/binfmts.h>
I see that linux/oom.h was removed from kernel/sysctl.h. This was not
part of any of the patches but it is the right thing to do. I'll make a
note of it and make sure to remove it if it comes back

Thx again.

Best

-- 

Joel Granados