linux-kernel - Re: linux-next: manual merge of the drm-misc tree with the amdgpu 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 for Android: free password hash cracker in your pocket

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

Date:   Thu, 5 Nov 2020 11:39:05 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Daniel Vetter <daniel.vetter@...ll.ch>,
        Intel Graphics <intel-gfx@...ts.freedesktop.org>,
        DRI <dri-devel@...ts.freedesktop.org>,
        Alex Deucher <alexander.deucher@....com>
Cc:     Christian König <christian.koenig@....com>,
        Dave Airlie <airlied@...hat.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Mihir Bhogilal Patel <Mihir.Patel@....com>
Subject: Re: linux-next: manual merge of the drm-misc tree with the amdgpu
 tree

Hi all,

On Wed, 28 Oct 2020 12:06:31 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
> 
>   drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> 
> between commit:
> 
>   ff72bc403170 ("drm/amdgpu: Add debugfs entry for printing VM info")
> 
> from the amdgpu tree and commit:
> 
>   4671078eb8e3 ("drm/amdgpu: switch over to the new pin interface")
> 
> from the drm-misc tree.
> 
> I fixed it up (I used the former version of this file and added the
> following patch) 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.
> 
> From: Stephen Rothwell <sfr@...b.auug.org.au>
> Date: Wed, 28 Oct 2020 11:52:31 +1100
> Subject: [PATCH] merge fix up for "drm/amdgpu: Add debugfs entry for printing
>  VM info"
> 
> Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> index baca32263ec4..06dfe9b1c7e6 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> @@ -1555,7 +1555,7 @@ u64 amdgpu_bo_print_info(int id, struct amdgpu_bo *bo, struct seq_file *m)
>  	seq_printf(m, "\t\t0x%08x: %12lld byte %s",
>  			id, size, placement);
>  
> -	pin_count = READ_ONCE(bo->pin_count);
> +	pin_count = READ_ONCE(bo->tbo.pin_count);
>  	if (pin_count)
>  		seq_printf(m, " pin count %d", pin_count);
>  

This fix up is now needed in the merge between the drm tree and the
amdgpu tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped