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/trace/events/initcall.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/trace/events/initcall.h')
0 files changed, 0 insertions, 0 deletions