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

Stephen Rothwell
2019-12-11T23:37:42Z

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

Hi all,

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

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

between commit:

62914a99dee5 ("drm/amdgpu: Use mmu_interval_insert instead of hmm_mirror")

from Linus' tree and commit:

8497d2bcdee1 ("drm/amd/powerplay: enable pp one vf mode for vega10")

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.

--
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index c17505fba988,8992506541d8..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@@ -2794,8 -2828,6 +2828,7 @@@ int amdgpu_device_init(struct amdgpu_de
mutex_init(&adev->virt.vf_errors.lock);
hash_init(adev->mn_hash);
mutex_init(&adev->lock_reset);
+ mutex_init(&adev->notifier_lock);
- mutex_init(&adev->virt.dpm_mutex);
mutex_init(&adev->psp.mutex);

r = amdgpu_device_check_arguments(adev);