From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Jan 2024 00:43:55 +0000 (-0800)
Subject: Merge tag 'header_cleanup-2024-01-10' of https://evilpiepirate.org/git/bcachefs
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=78273df7f646f8daf2604ec714bea0897cd03aae;p=users%2Fwilly%2Fxarray.git

Merge tag 'header_cleanup-2024-01-10' of https://evilpiepirate.org/git/bcachefs

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
  ...
---

78273df7f646f8daf2604ec714bea0897cd03aae
diff --cc arch/x86/include/asm/paravirt_types.h
index d8e85d2cf8d5,3cfcd5db083b..8d4fbe1be489
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h
@@@ -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 include/linux/uidgid.h
index 415a7ca2b882,ba20b62f13e1..f85ec5613721
--- a/include/linux/uidgid.h
+++ b/include/linux/uidgid.h
@@@ -17,17 -17,7 +17,8 @@@
  
  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 }