diff options
| author | Lucas De Marchi <lucas.demarchi@intel.com> | 2024-08-16 20:05:54 +0300 |
|---|---|---|
| committer | Lucas De Marchi <lucas.demarchi@intel.com> | 2024-08-16 20:33:54 +0300 |
| commit | ed7171ff9fabc49ae6ed42fbd082a576473836fc (patch) | |
| tree | 62bc21b9b590a7fefb27b6103a121f4386e1815f /include/linux/kernel_stat.h | |
| parent | db3461a7743817ad7c73553902231b096616813a (diff) | |
| parent | a809b92ee0f84c3f655b16a8b4d04bc3665d954a (diff) | |
| download | linux-ed7171ff9fabc49ae6ed42fbd082a576473836fc.tar.xz | |
Merge drm/drm-next into drm-xe-next
Get drm-xe-next on v6.11-rc2 and synchronized with drm-intel-next for
the display side. This resolves the current conflict for the
enable_display module parameter and allows further pending refactors.
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Diffstat (limited to 'include/linux/kernel_stat.h')
| -rw-r--r-- | include/linux/kernel_stat.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h index 9c042c6384bb..b97ce2df376f 100644 --- a/include/linux/kernel_stat.h +++ b/include/linux/kernel_stat.h @@ -5,7 +5,6 @@ #include <linux/smp.h> #include <linux/threads.h> #include <linux/percpu.h> -#include <linux/cpumask.h> #include <linux/interrupt.h> #include <linux/sched.h> #include <linux/vtime.h> |