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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 31 May 2024 13:18:35 +1000

Hi all,

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

  drivers/gpu/drm/xe/xe_pci.c

between commit:

  ca5d5ecbb90d ("drm/xe/bmg: Enable the display support")

from the drm-intel tree and commit:

  37ea1aee18e7 ("drm/xe: Drop undesired prefix from the platform name")

from the drm-xe 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/xe/xe_pci.c
index d6859108cc69,e84da0cbb8e9..000000000000
--- a/drivers/gpu/drm/xe/xe_pci.c
+++ b/drivers/gpu/drm/xe/xe_pci.c
@@@ -341,8 -342,7 +342,8 @@@ static const struct xe_device_desc lnl_
  
  static const struct xe_device_desc bmg_desc __maybe_unused = {
  	DGFX_FEATURES,
- 	PLATFORM(XE_BATTLEMAGE),
+ 	PLATFORM(BATTLEMAGE),
 +	.has_display = true,
  	.require_force_probe = true,
  };