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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:   Tue, 6 Jul 2021 10:52:11 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Alex Deucher <alexdeucher@...il.com>
Cc:     Alex Deucher <alexander.deucher@....com>,
        Alex Sierra <alex.sierra@....com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the amdgpu tree with Linus' tree

Hi all,

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

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

between commit:

  e058a84bfddc ("Merge tag 'drm-next-2021-07-01' of git://anongit.freedesktop.org/drm/drm")

from the origin tree and commit:

  8c21fc49a8e6 ("drm/amdkfd: add owner ref param to get hmm pages")

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_ttm.c
index 307d22abd814,2e9ad6e0dfbb..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@@ -695,9 -692,8 +691,9 @@@ int amdgpu_ttm_tt_get_user_pages(struc
  	readonly = amdgpu_ttm_tt_is_readonly(ttm);
  	r = amdgpu_hmm_range_get_pages(&bo->notifier, mm, pages, start,
  				       ttm->num_pages, &gtt->range, readonly,
- 				       true);
 -				       false, NULL);
 -out_putmm:
++				       true, NULL);
 +out_unlock:
 +	mmap_read_unlock(mm);
  	mmput(mm);
  
  	return r;

Content of type "application/pgp-signature" skipped