linux-kernel - Re: linux-next: manual merge of the drm-misc 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>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20250701132040.4f6c04a8@canb.auug.org.au>
Date: Tue, 1 Jul 2025 13:20:40 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Alex Deucher <alexander.deucher@....com>
Cc: Simona Vetter <simona.vetter@...ll.ch>, Intel Graphics
 <intel-gfx@...ts.freedesktop.org>, DRI <dri-devel@...ts.freedesktop.org>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the drm-misc tree with Linus' tree

Hi all,

Sorry, this was actually a conflict between the amdgpu tree and Linus'
tree.

On Tue, 1 Jul 2025 12:57:05 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> On Tue, 1 Jul 2025 12:54:43 +1000 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_fence.c
> > 
> > between commit:
> > 
> >   ebe43542702c ("drm/amdgpu: switch job hw_fence to amdgpu_fence")
> > 
> > from Linus' tree and commit:
> > 
> >   d0c35c84dcfa ("drm/amdgpu: remove job parameter from amdgpu_fence_emit()")
> > 
> > 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.  
> 
> I used the latter version of the conflicting section.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped