Hi all,

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

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

between commits:

  962d684b5dc074 ("drm/amdgpu: fix amdgpu_hmm_range_get_pages")
  1c824497d8acd3 ("drm/amdgpu: fix calling VM invalidation in amdgpu_hmm_invalidate_gfx")
  58bafc666c484b ("drm/amdgpu: fix waiting for all submissions for userptrs")

from the origin tree and commits:

  c08972f555945c ("drm/amdgpu: fix amdgpu_hmm_range_get_pages")
  b6444d1bcbc34f ("drm/amdgpu: fix calling VM invalidation in amdgpu_hmm_invalidate_gfx")
  91250893cbaa25 ("drm/amdgpu: fix waiting for all submissions for userptrs")
  342981fff32802 ("drm/amdgpu: drop retry loop in amdgpu_hmm_range_get_pages")

from the drm 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 --combined drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c
index e452444b33b08b,99bc9ad67d5b83..00000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c
@@@ -174,7 -174,6 +174,6 @@@ int amdgpu_hmm_range_get_pages(struct m
  	const u64 max_bytes = SZ_2G;
  
  	struct hmm_range *hmm_range = &range->hmm_range;
- 	unsigned long timeout;
  	unsigned long *pfns;
  	unsigned long end;
  	int r;
@@@ -201,15 -200,9 +200,9 @@@
  		pr_debug("hmm range: start = 0x%lx, end = 0x%lx",
  			hmm_range->start, hmm_range->end);
  
- 		timeout = jiffies + msecs_to_jiffies(HMM_RANGE_DEFAULT_TIMEOUT);
- 
- retry:
  		r = hmm_range_fault(hmm_range);
- 		if (unlikely(r)) {
- 			if (r == -EBUSY && !time_after(jiffies, timeout))
- 				goto retry;
+ 		if (unlikely(r))
  			goto out_free_pfns;
- 		}
  
  		if (hmm_range->end == end)
  			break;