linux-next: manual merge of the amdgpu tree with Linus' tree

Stephen Rothwell
2019-10-28T01:11:38Z

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

Hi all,

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

drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h

between commit:

155f85c0d568 ("drm/amd/powerplay: remove duplicate macro smu_get_uclk_dpm_states in amdgpu_smu.h")

from Linus' tree and commit:

18c1d3cee4c5 ("drm/amd/powerplay: split out those internal used swSMU APIs V2")

from the amdgpu tree.

I fixed it up (I just used the amdgpu tree version) 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.