linux-kernel - Re: linux-next: manual merge of the drm tree with the origin 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: <e2eeec46-cc0e-46e8-8069-085fbd06afe3@kernel.org>
Date: Thu, 2 Oct 2025 14:30:13 +0200
From: Danilo Krummrich <dakr@...nel.org>
To: Mark Brown <broonie@...nel.org>
Cc: Dave Airlie <airlied@...hat.com>, DRI <dri-devel@...ts.freedesktop.org>,
 Alice Ryhl <aliceryhl@...gle.com>, Andrew Morton
 <akpm@...ux-foundation.org>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
 Linux Next Mailing List <linux-next@...r.kernel.org>,
 Vitaly Wool <vitaly.wool@...sulko.se>
Subject: Re: linux-next: manual merge of the drm tree with the origin tree

On 10/2/25 2:05 PM, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the drm tree got a conflict in:

(I think this was a conflict between the DRM tree and the MM tree already before.)

The resolution looks good to me, thanks!

- Danilo