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

From: Stephen Rothwell <[email-masked]>
Date: Thu, 12 Aug 2021 11:28:32 +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:

  3ffe82d701a4 ("drm/i915/xehp: handle new steering options")

from the drm tree and commit:

  22e26af76903 ("drm/i915: Fork DG1 interrupt handler")

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 f88be11a3570,ef1eecd259e0..000000000000
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@@ -133,8 -131,6 +131,7 @@@ enum intel_ppgtt_type 
  	func(has_llc); \
  	func(has_logical_ring_contexts); \
  	func(has_logical_ring_elsq); \
- 	func(has_master_unit_irq); \
 +	func(has_mslices); \
  	func(has_pooled_eu); \
  	func(has_rc6); \
  	func(has_rc6p); \