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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1340 bytes --]

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]