diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2023-10-17 22:40:46 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2023-10-17 22:40:46 +0300 |
| commit | a940daa52167e9db8ecce82213813b735a9d9f23 (patch) | |
| tree | d5346c51351ccd1da7532cbec3127e6b73ec59c9 /include/linux/cpuhotplug.h | |
| parent | 32e4fa37fa667fdf53499b9de92737dc75199d8e (diff) | |
| parent | 58720809f52779dc0f08e53e54b014209d13eebb (diff) | |
| download | linux-a940daa52167e9db8ecce82213813b735a9d9f23.tar.xz | |
Merge branch 'linus' into smp/core
Pull in upstream to get the fixes so depending changes can be applied.
Diffstat (limited to 'include/linux/cpuhotplug.h')
| -rw-r--r-- | include/linux/cpuhotplug.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index cd8bd6ed04f9..d246d325918a 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -90,7 +90,6 @@ enum cpuhp_state { CPUHP_FS_BUFF_DEAD, CPUHP_PRINTK_DEAD, CPUHP_MM_MEMCQ_DEAD, - CPUHP_XFS_DEAD, CPUHP_PERCPU_CNT_DEAD, CPUHP_RADIX_DEAD, CPUHP_PAGE_ALLOC, |