linux-kernel - 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>] [day] [month] [year] [list]

Message-ID: <aYkSWobP3JUatoHn@sirena.co.uk>
Date: Sun, 8 Feb 2026 22:46:50 +0000
From: Mark Brown <broonie@...nel.org>
To: Dave Airlie <airlied@...hat.com>, DRI <dri-devel@...ts.freedesktop.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Matthew Brost <matthew.brost@...el.com>,
	Michal Wajdeczko <michal.wajdeczko@...el.com>,
	Rodrigo Vivi <rodrigo.vivi@...el.com>,
	Satyanarayana K V P <satyanarayana.k.v.p@...el.com>,
	Shuicheng Lin <shuicheng.lin@...el.com>,
	Thomas Hellström <thomas.hellstrom@...ux.intel.com>
Subject: linux-next: manual merge of the drm tree with the origin tree

Hi all,

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

  drivers/gpu/drm/xe/xe_migrate.c

between commit:

  e022c16965b834 ("drm/xe: Fix kerneldoc for xe_migrate_exec_queue")

from the origin tree and commits:

  fa18290bf0723b ("drm/xe/vf: Shadow buffer management for CCS read/write operations")
  5d5ef695497950 ("drm/xe: Fix kerneldoc for xe_migrate_exec_queue")

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/xe/xe_migrate.c
index 9d7329cef910af,078a9bc2821dd6..00000000000000
--- a/drivers/gpu/drm/xe/xe_migrate.c
+++ b/drivers/gpu/drm/xe/xe_migrate.c

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