linux-kernel - linux-next: manual merge of the drm tree with the mm-unstable 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]

Message-ID: <aXjJCmDiKFYA0-P6@sirena.org.uk>
Date: Tue, 27 Jan 2026 14:17:46 +0000
From: Mark Brown <broonie@...nel.org>
To: Dave Airlie <airlied@...hat.com>, DRI <dri-devel@...ts.freedesktop.org>
Cc: Alex Deucher <alexander.deucher@....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>,
	Oleg Nesterov <oleg@...hat.com>,
	Zhu Lingshan <lingshan.zhu@....com>
Subject: linux-next: manual merge of the drm tree with the mm-unstable tree

Hi all,

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

  drivers/gpu/drm/amd/amdkfd/kfd_process.c

between commit:

  8635c94737032 ("drm/amd: kill the outdated "Only the pthreads threading model is supported" checks")

from the mm-unstable tree and commit:

  d59e9d2d556ad ("amdkfd: process pointer of a HIQ should be NULL")

from the drm 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.

diff --cc drivers/gpu/drm/amd/amdkfd/kfd_process.c
index f8ef18a3aa71d,ba25d83c23e78..0000000000000
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)