From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 25 Feb 2025 05:07:21 +0000 (+1100)
Subject: Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl... 
X-Git-Tag: next-20250225~8
X-Git-Url: https://gentwo.org/gitweb/?a=commitdiff_plain;h=59ad583aa687b50a625e4776fc819b8f11babc95;p=linux%2F.git

Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git

# Conflicts:
#	kernel/sysctl.c
---

59ad583aa687b50a625e4776fc819b8f11babc95
diff --cc kernel/sysctl.c
index 635f5e829fe8,eeb4cba12190..b65489f7fcf7
--- 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>