linux-kernel - linux-next: manual merge of the drm tree with the asm-generic 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20241028132707.24aded7d@canb.auug.org.au>
Date: Mon, 28 Oct 2024 13:27:07 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Dave Airlie <airlied@...hat.com>, Arnd Bergmann <arnd@...db.de>
Cc: DRI <dri-devel@...ts.freedesktop.org>, Arnd Bergmann <arnd@...nel.org>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Niklas Schnelle
 <schnelle@...ux.ibm.com>, Thomas Zimmermann <tzimmermann@...e.de>
Subject: linux-next: manual merge of the drm tree with the asm-generic tree

Hi all,

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

  drivers/gpu/drm/gma500/Kconfig

between commit:

  65f5bf96750f ("drm: handle HAS_IOPORT dependencies")

from the asm-generic tree and commit:

  aecdbfe459a0 ("drm/gma500: Run DRM default client setup")

from the drm 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/gma500/Kconfig
index 23b7c14de5e2,c2927c37c40b..000000000000
--- a/drivers/gpu/drm/gma500/Kconfig
+++ b/drivers/gpu/drm/gma500/Kconfig
@@@ -1,7 -1,8 +1,8 @@@
  # SPDX-License-Identifier: GPL-2.0-only
  config DRM_GMA500
  	tristate "Intel GMA500/600/3600/3650 KMS Framebuffer"
 -	depends on DRM && PCI && X86 && MMU
 +	depends on DRM && PCI && X86 && MMU && HAS_IOPORT
+ 	select DRM_CLIENT_SELECTION
  	select DRM_KMS_HELPER
  	select FB_IOMEM_HELPERS if DRM_FBDEV_EMULATION
  	select I2C

Content of type "application/pgp-signature" skipped