linux-next: manual merge of the drm-misc tree with the origin tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

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

between commit:

  9ae807f0ec6a ("drm/amdgpu: clean up inconsistent indenting")

from the origin tree and commit:

  0d979509539e ("drm/ttm: remove ttm_bo_vm_insert_huge()")

from the drm-misc 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_gem.c
index a573424a6e0b,a1e63ba4c54a..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@@ -60,9 -60,10 +60,9 @@@ static vm_fault_t amdgpu_gem_fault(stru
  			goto unlock;
  		}
  
 -		 ret = ttm_bo_vm_fault_reserved(vmf, vmf->vma->vm_page_prot,
 -						TTM_BO_VM_NUM_PREFAULT);
 -
 -		 drm_dev_exit(idx);
 +		ret = ttm_bo_vm_fault_reserved(vmf, vmf->vma->vm_page_prot,
- 					       TTM_BO_VM_NUM_PREFAULT, 1);
++					       TTM_BO_VM_NUM_PREFAULT);
 +		drm_dev_exit(idx);
  	} else {
  		ret = ttm_bo_vm_dummy_page(vmf, vmf->vma->vm_page_prot);
  	}

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]