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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20251103101841.537c87dc@canb.auug.org.au>
Date: Mon, 3 Nov 2025 10:18:41 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Simona Vetter <simona.vetter@...ll.ch>, Jani Nikula
 <jani.nikula@...ux.intel.com>, Joonas Lahtinen
 <joonas.lahtinen@...ux.intel.com>, Rodrigo Vivi <rodrigo.vivi@...el.com>,
 Dave Airlie <airlied@...hat.com>
Cc: Intel Graphics <intel-gfx@...ts.freedesktop.org>, DRI
 <dri-devel@...ts.freedesktop.org>, Balasubramani Vivekanandan
 <balasubramani.vivekanandan@...el.com>, Dnyaneshwar Bhadane
 <dnyaneshwar.bhadane@...el.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Lucas De Marchi <lucas.demarchi@...el.com>,
 Matt Roper <matthew.d.roper@...el.com>, Suraj Kandpal
 <suraj.kandpal@...el.com>
Subject: linux-next: manual merge of the drm-intel tree with the drm tree

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);

Content of type "application/pgp-signature" skipped