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
