linux-kernel - linux-next: manual merge of the drm-xe tree with the pci 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: <20250603134213.0a7baf0a@canb.auug.org.au>
Date: Tue, 3 Jun 2025 13:42:13 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Lucas De Marchi <lucas.demarchi@...el.com>, Thomas Hellström <thomas.hellstrom@...ux.intel.com>, Bjorn Helgaas
 <bhelgaas@...gle.com>, Lorenzo Pieralisi <lpieralisi@...nel.org>, Krzysztof
 Wilczyński <kwilczynski@...nel.org>
Cc: Arnd Bergmann <arnd@...db.de>, DRM XE List
 <intel-xe@...ts.freedesktop.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the drm-xe tree with the pci tree

Hi all,

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

  drivers/gpu/drm/xe/Kconfig

between commit:

  8fe743b5eba0 ("PCI: Add CONFIG_MMU dependency")

from the pci tree and commit:

  e4931f8be347 ("drm/xe/vsec: fix CONFIG_INTEL_VSEC dependency")

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/Kconfig
index 2169bc969ea1,98b46c534278..000000000000
--- a/drivers/gpu/drm/xe/Kconfig
+++ b/drivers/gpu/drm/xe/Kconfig
@@@ -1,7 -1,9 +1,9 @@@
  # SPDX-License-Identifier: GPL-2.0-only
  config DRM_XE
  	tristate "Intel Xe Graphics"
 -	depends on DRM && PCI && MMU && (m || (y && KUNIT=y))
 +	depends on DRM && PCI && (m || (y && KUNIT=y))
+ 	depends on INTEL_VSEC || !INTEL_VSEC
+ 	depends on X86_PLATFORM_DEVICES || !(X86 && ACPI)
  	select INTERVAL_TREE
  	# we need shmfs for the swappable backing store, and in particular
  	# the shmem_readpage() which depends upon tmpfs

Content of type "application/pgp-signature" skipped