Received-SPF: pass (google.com: domain of linux-kernel+bounces-196217-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Fri, 31 May 2024 13:18:35 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Lucas De Marchi <lucas.demarchi@intel.com>, Thomas =?UTF-8?B?SGVsbHN0?=
 =?UTF-8?B?csO2bQ==?= <thomas.hellstrom@linux.intel.com>
Cc: DRM XE List <intel-xe@lists.freedesktop.org>, Balasubramani Vivekanandan
 <balasubramani.vivekanandan@intel.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Michal Wajdeczko
 <michal.wajdeczko@intel.com>, Radhakrishna Sripada
 <radhakrishna.sripada@intel.com>
Subject: linux-next: manual merge of the drm-xe tree with the drm-intel tree
Message-ID: <20240531131835.62339471@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/bXRMegfrycV3ynjtQdNKckB";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/bXRMegfrycV3ynjtQdNKckB
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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.

--=20
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_
 =20
  static const struct xe_device_desc bmg_desc __maybe_unused =3D {
  	DGFX_FEATURES,
- 	PLATFORM(XE_BATTLEMAGE),
+ 	PLATFORM(BATTLEMAGE),
 +	.has_display =3D true,
  	.require_force_probe =3D true,
  };
 =20

--Sig_/bXRMegfrycV3ynjtQdNKckB
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZZQYsACgkQAVBC80lX
0GzPTQf+IHecx1bRuM2FRMQ/x7SCWU0rbUfIaxxepptlCtkjqZlefXFiZZbXIjV2
/jdPOyFw6ofc9tQYsopslFO/WyyNwKGVviZHRyLpsKrO2tKEFGbf18Qxt1EXOcCT
EISBxgrBQ5MR+3O1DBpUZje2NZNmsyvuwlI5TrD+HMISP5aEZUEpeLGHmtVluKC5
4Er3mdZKUQ8wYlnHGv1Wpv91BNMUIuOnInXHbNecj2UBiADsoZIYZdmfy6ocsyO9
sMpbYcEpkY7tu/d9RRUxyGhBwDI/0PkzEda9M3AbOqxbgRkuF2fg/6wDcXkOZDQh
jo14k4blD6F43eB+JLPOhzb/moEseA==
=59lo
-----END PGP SIGNATURE-----

--Sig_/bXRMegfrycV3ynjtQdNKckB--