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

Commit Message

Stephen Rothwell Nov. 17, 2020, 12:31 a.m. UTC

Hi all,

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

  drivers/gpu/drm/radeon/radeon_drv.c

between commit:

  384bc5e059d4 ("drm/radeon: Stop changing the drm_driver struct")

from the drm tree and commits:

  4d3efadd374a ("drm/radeon/radeon: Move prototype into shared header")
  0a2e8d51e4da ("drm/radeon/radeon_drv: Move 'radeon_mmap()'s prototype to shared header")
  f3723ad110c5 ("drm/radeon/radeon_drv: Move 'radeon_driver_irq_handler_kms's prototype into shared header")
  4138b62b8a79 ("drm/radeon/radeon_drv: Move 'radeon_gem_prime_import_sg_table()'s prototype to shared header")

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.

Patch

diff --cc drivers/gpu/drm/radeon/radeon_drv.c
index bfadb799d6a3,84f5d56528ee..000000000000
--- a/drivers/gpu/drm/radeon/radeon_drv.c