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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 5 Apr 2022 11:00:11 +1000

Hi all,

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

  drivers/gpu/drm/i915/intel_device_info.h

between commit:

  5e3094cfd9fb ("drm/i915/xehpsdv: Add has_flat_ccs to device info")

from Linus' tree and commit:

  072ce4164f97 ("drm/i915/dg2: Tile 4 plane format support")

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/intel_device_info.h
index 291215d9da28,8026e805ff12..000000000000
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@@ -134,10 -131,9 +134,11 @@@ enum intel_ppgtt_type 
  	/* Keep has_* in alphabetical order */ \
  	func(has_64bit_reloc); \
  	func(has_64k_pages); \
 +	func(needs_compact_pt); \
  	func(gpu_reset_clobbers_display); \
  	func(has_reset_engine); \
 +	func(has_flat_ccs); \
+ 	func(has_4tile); \
  	func(has_global_mocs); \
  	func(has_gt_uc); \
  	func(has_guc_deprivilege); \