Hi all, Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/xe/xe_pci.c
between commits:
c002b1764e7b ("drm/xe/nvl: Define NVL-S platform")
5e0de2dfbc1b ("drm/xe/cri: Add CRI platform definition")
from the drm tree and commit:
32620e176443 ("drm/pcids: Split PTL pciids group to make wcl subplatform")
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/xe/xe_pci.c
index 6e59642e7820,67c808bb22a8..000000000000
--- a/drivers/gpu/drm/xe/xe_pci.c
+++ b/drivers/gpu/drm/xe/xe_pci.c
@@@ -440,8 -375,7 +440,9 @@@ static const struct pci_device_id pciid
INTEL_LNL_IDS(INTEL_VGA_DEVICE, &lnl_desc),
INTEL_BMG_IDS(INTEL_VGA_DEVICE, &bmg_desc),
INTEL_PTL_IDS(INTEL_VGA_DEVICE, &ptl_desc),
+ INTEL_NVLS_IDS(INTEL_VGA_DEVICE, &nvls_desc),
+ INTEL_CRI_IDS(INTEL_PCI_DEVICE, &cri_desc),
+ INTEL_WCL_IDS(INTEL_VGA_DEVICE, &ptl_desc),
{ }
};
MODULE_DEVICE_TABLE(pci, pciidlist);
pgpfgE_iIWCUc.pgp
Description: OpenPGP digital signature
