Merge tag 'header_cleanup-2024-01-10' of https://evilpiepirate.org/git/bcachefs
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Jan 2024 00:43:55 +0000 (16:43 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Jan 2024 00:43:55 +0000 (16:43 -0800)
Pull header cleanups from Kent Overstreet:
 "The goal is to get sched.h down to a type only header, so the main
  thing happening in this patchset is splitting out various _types.h
  headers and dependency fixups, as well as moving some things out of
  sched.h to better locations.

  This is prep work for the memory allocation profiling patchset which
  adds new sched.h interdepencencies"

* tag 'header_cleanup-2024-01-10' of https://evilpiepirate.org/git/bcachefs: (51 commits)
  Kill sched.h dependency on rcupdate.h
  kill unnecessary thread_info.h include
  Kill unnecessary kernel.h include
  preempt.h: Kill dependency on list.h
  rseq: Split out rseq.h from sched.h
  LoongArch: signal.c: add header file to fix build error
  restart_block: Trim includes
  lockdep: move held_lock to lockdep_types.h
  sem: Split out sem_types.h
  uidgid: Split out uidgid_types.h
  seccomp: Split out seccomp_types.h
  refcount: Split out refcount_types.h
  uapi/linux/resource.h: fix include
  x86/signal: kill dependency on time.h
  syscall_user_dispatch.h: split out *_types.h
  mm_types_task.h: Trim dependencies
  Split out irqflags_types.h
  ipc: Kill bogus dependency on spinlock.h
  shm: Slim down dependencies
  workqueue: Split out workqueue_types.h
  ...

23 files changed:
1  2 
arch/x86/include/asm/fpu/types.h
arch/x86/include/asm/paravirt.h
arch/x86/include/asm/paravirt_types.h
fs/exec.c
include/linux/lockdep_types.h
include/linux/mutex.h
include/linux/sched.h
include/linux/sched/signal.h
include/linux/sched/task.h
include/linux/spinlock.h
include/linux/uidgid.h
include/linux/workqueue.h
init/init_task.c
kernel/async.c
kernel/exit.c
kernel/fork.c
kernel/sched/core.c
mm/filemap.c
mm/khugepaged.c
mm/shmem.c
mm/swapfile.c
security/selinux/hooks.c
security/smack/smack_lsm.c

Simple merge
Simple merge
index d8e85d2cf8d56e4d591a1747e8d54f5b67611174,3cfcd5db083b35185dafa96b29f8f10b493a6d17..8d4fbe1be489549ad33c968c2132bdbaf739b871
@@@ -5,6 -5,17 +5,7 @@@
  #ifdef CONFIG_PARAVIRT
  
  #ifndef __ASSEMBLY__
++#include <linux/types.h>
  
  #include <asm/desc_defs.h>
  #include <asm/pgtable_types.h>
diff --cc fs/exec.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 415a7ca2b8829ce9ec2077a34d1ffc915d5eb559,ba20b62f13e1d6f2fd1ba41f424b8ffe01f10dc9..f85ec5613721fe1b4fc6c51b80c9a32cc617c19b
  
  struct user_namespace;
  extern struct user_namespace init_user_ns;
 +struct uid_gid_map;
  
- typedef struct {
-       uid_t val;
- } kuid_t;
- typedef struct {
-       gid_t val;
- } kgid_t;
  #define KUIDT_INIT(value) (kuid_t){ value }
  #define KGIDT_INIT(value) (kgid_t){ value }
  
Simple merge
Simple merge
diff --cc kernel/async.c
Simple merge
diff --cc kernel/exit.c
Simple merge
diff --cc kernel/fork.c
Simple merge
Simple merge
diff --cc mm/filemap.c
Simple merge
diff --cc mm/khugepaged.c
Simple merge
diff --cc mm/shmem.c
Simple merge
diff --cc mm/swapfile.c
Simple merge
Simple merge
Simple merge