From: Jani Nikula <jani.nikula@intel.com>
Date: Tue, 11 Nov 2025 10:32:07 +0000 (+0200)
Subject: Merge drm/drm-next into drm-intel-next
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c1960f57151e36f550d1a53352f832d5aaa5f8f;p=thirdparty%2Fkernel%2Flinux.git

Merge drm/drm-next into drm-intel-next

Primarily sync with the drm_print.h changes from drm-misc.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---

1c1960f57151e36f550d1a53352f832d5aaa5f8f
diff --cc drivers/gpu/drm/i915/display/intel_frontbuffer.c
index 4761e116e442f,c88bef22d3660..03c4978fa5ecf
--- a/drivers/gpu/drm/i915/display/intel_frontbuffer.c
+++ b/drivers/gpu/drm/i915/display/intel_frontbuffer.c
@@@ -56,7 -56,10 +56,8 @@@
   */
  
  #include <drm/drm_gem.h>
+ #include <drm/drm_print.h>
  
 -#include "i915_active.h"
 -#include "i915_vma.h"
  #include "intel_bo.h"
  #include "intel_display_trace.h"
  #include "intel_display_types.h"