Subject: linux-next: manual merge of the drm-intel tree with the drm-misc tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 3 Nov 2025 10:22:33 +1100

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in:

  drivers/gpu/drm/i915/display/intel_bw.c

between commit:

  f6e8dc9edf96 ("drm: include drm_print.h where needed")

from the drm-misc tree and commit:

  ac930bab1c89 ("drm/i915/bw: Untangle dbuf bw from the sagv/mem bw stuff")

from the drm-intel tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/i915/display/intel_bw.c
index b3e4cc9985e9,3033c53e61d1..000000000000
--- a/drivers/gpu/drm/i915/display/intel_bw.c
+++ b/drivers/gpu/drm/i915/display/intel_bw.c
@@@ -3,9 -3,6 +3,8 @@@
   * Copyright © 2019 Intel Corporation
   */
  
- #include <drm/drm_atomic_state_helper.h>
 +#include <drm/drm_print.h>
 +
  #include "soc/intel_dram.h"
  
  #include "i915_drv.h"