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

Date: Tue, 6 Feb 2024 14:21:09 -0600
From: Lucas De Marchi <lucas.demarchi@...el.com>
To: Thomas Hellström <thomas.hellstrom@...ux.intel.com>
CC: Stephen Rothwell <sfr@...b.auug.org.au>, Daniel Vetter
	<daniel.vetter@...ll.ch>, Matthew Brost <matthew.brost@...el.com>, "Rodrigo
 Vivi" <rodrigo.vivi@...el.com>, Christian König
	<christian.koenig@....com>, Somalapuram Amaranath
	<Amaranath.Somalapuram@....com>, 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>, Dave Airlie <airlied@...il.com>,
	<intel-xe@...ts.freedesktop.org>
Subject: Re: Re: linux-next: build failure after merge of the drm-misc tree

On Tue, Feb 06, 2024 at 01:39:28PM +0100, Thomas Hellström wrote:
>Hi
>
>On Tue, 2024-02-06 at 12:28 +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> After merging the drm-misc tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>>
>> Caused by commit
>>
>>   a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
>>
>> interacting with commit
>>
>>   dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
>>
>> (and maybe others) from Linus' tree (v6.8-rc1).
>>
>> I have applied the following merge fix patch for today.  This makes
>> it build,
>> but more is likely needed ...
>
>There was a manual fixup for the drm-misc-next merge into drm-tip that
>did the right thing here.
>
>How do we ensure these are included into the linux-next builds?

I think it should have been done in commit 4db102dcb039 ("Merge drm/drm-next into drm-misc-next")
when drm-next merged back into drm-misc-next. Now one option is probably a
commit on drm-misc-next with this content:
https://cgit.freedesktop.org/drm-tip/tree/fixups/drm-misc-next.patch?h=rerere-cache&id=c39c6e3d74203820ef630884a5323237696bd36c


Lucas De Marchi