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

# Conflicts:
#	include/linux/mm.h
#	kernel/sysctl.c
#	mm/filemap.c

diff --cc MAINTAINERS
Simple merge

diff --cc fs/coredump.c
Simple merge

diff --cc fs/dcache.c
Simple merge

diff --cc fs/drop_caches.c
Simple merge

diff --cc include/linux/dcache.h
Simple merge

diff --cc include/linux/mm.h
index 3582ecbf39dad5fc03625efbae618c7444cdf0cc,f5ba3ed8b44a3755b00763af8a37b100a947f41d..b7f13f087954bdccfe1e263d39a59bfd1d738ab6
--- 1/include/linux/mm.h
--- 2/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);
  

diff --cc include/linux/swap.h
Simple merge

diff --cc include/linux/vmstat.h
Simple merge

diff --cc include/linux/writeback.h
Simple merge

diff --cc kernel/sysctl.c
index 4ebe6136b08d36d393ed950f8884b9d2c2329954,eeb4cba121903cab5c835fb46db0e893d200de0f..88b83fb504c8bffa46a0886425fdfb649b6fc86e
--- 1/kernel/sysctl.c
--- 2/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>

diff --cc mm/filemap.c
index 1911d43b319e0c9a0e66a8fe039a566f1adbce24,004d78767804dcf8cec9f238285a18acf22c6f51..b5e784f34d980b64242d6e45a8c98a18e7be00ca
--- 1/mm/filemap.c
--- 2/mm/filemap.c
+++ b/mm/filemap.c
@@@ -47,6 -47,8 +47,7 @@@
  #include <linux/splice.h>
  #include <linux/rcupdate_wait.h>
  #include <linux/sched/mm.h>
 -#include <linux/fsnotify.h>
+ #include <linux/sysctl.h>
  #include <asm/pgalloc.h>
  #include <asm/tlbflush.h>
  #include "internal.h"

diff --cc mm/internal.h
Simple merge

diff --cc mm/mmap.c
Simple merge

diff --cc mm/nommu.c
index 63d572c74680f9ecdf664935433ae0cb0f30cc92,3c32f8b1eb5416a57e3dcfef5bb2597fbae5347d..617e7ba8022f5bd56b738a8a9ec350718d0a6525
--- 1/mm/nommu.c
--- 2/mm/nommu.c
+++ b/mm/nommu.c
@@@ -42,8 -42,12 +42,7 @@@
  #include <asm/mmu_context.h>
  #include "internal.h"
  
 -void *high_memory;
 -EXPORT_SYMBOL(high_memory);
 -struct page *mem_map;
 -unsigned long max_mapnr;
 -EXPORT_SYMBOL(max_mapnr);
  unsigned long highest_memmap_pfn;
- int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
  int heap_stack_gap = 0;
  
  atomic_long_t mmap_pages_allocated;

diff --cc mm/swap.c
Simple merge

diff --cc mm/swap.h
Simple merge

diff --cc mm/util.c
Simple merge

diff --cc mm/vmscan.c
Simple merge

diff --cc mm/vmstat.c
Simple merge