linux-kernel - linux-next: manual merge of the drm-xe tree with the drm-fixes 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: <aXOVAyMnaCIwgF6r@sirena.org.uk>
Date: Fri, 23 Jan 2026 15:34:27 +0000
From: Mark Brown <broonie@...nel.org>
To: Lucas De Marchi <lucas.demarchi@...el.com>,
	Thomas Hellström <thomas.hellstrom@...ux.intel.com>,
	DRM XE List <intel-xe@...ts.freedesktop.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the drm-xe tree with the drm-fixes tree

Hi all,

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

  include/drm/drm_pagemap.h

between commit:

  bdcdf968be314 ("drm, drm/xe: Fix xe userptr in the absence of CONFIG_DEVICE_PRIVATE")

from the drm-fixes tree and commit:

  1e372b246199c ("drm, drm/xe: Fix xe userptr in the absence of CONFIG_DEVICE_PRIVATE")

from the drm-xe 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 include/drm/drm_pagemap.h
index b7a78c1ca7670,2baf0861f78f3..0000000000000
--- a/include/drm/drm_pagemap.h
+++ b/include/drm/drm_pagemap.h