diff mbox series

linux-next: manual merge of the amdgpu tree with the drm tree

Message ID 20221028105757.123c05c9@canb.auug.org.au (mailing list archive)
State New, archived
Headers show
Series linux-next: manual merge of the amdgpu tree with the drm tree | expand

Commit Message

Stephen Rothwell Oct. 27, 2022, 11:57 p.m. UTC
Hi all,

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

  drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c

between commit:

  7c99616e3fe7 ("drm: Remove drm_mode_config::fb_base")

from the drm tree and commit:

  887e8cec55f2 ("drm/amdgpu: set fb_modifiers_not_supported in vkms")

from the amdgpu 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.
diff mbox series

Patch

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
index 09dec2561adf,500a1dc4fe02..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c