linux-next: manual merge of the drm tree with the asm-generic tree

Commit Message

Stephen Rothwell Oct. 28, 2024, 2:29 a.m. UTC

Hi all,

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

  drivers/gpu/drm/qxl/Kconfig

between commit:

  65f5bf96750f ("drm: handle HAS_IOPORT dependencies")

from the asm-generic tree and commit:

  92c13542e878 ("drm/qxl: 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.

Patch

diff --cc drivers/gpu/drm/qxl/Kconfig
index 17d6927e5e23,1992df4a82d2..000000000000
--- a/drivers/gpu/drm/qxl/Kconfig