From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0AF37EF06F7 for ; Sun, 8 Feb 2026 22:46:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4DC7310E05F; Sun, 8 Feb 2026 22:46:55 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="mz+zDOcx"; dkim-atps=neutral Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5161110E05F for ; Sun, 8 Feb 2026 22:46:54 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id D7B6F4386F; Sun, 8 Feb 2026 22:46:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 987C4C4CEF7; Sun, 8 Feb 2026 22:46:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1770590813; bh=hEzUixNjVVNaa3Bxv+XxJ+VxH06BOg0rYo4G6AVrlLA=; h=Date:From:To:Cc:Subject:From; b=mz+zDOcxqewnhtiTyX911RPqDHx555kfBqnju6WLfG64Hxge/kJq+aZwdvMiDzr1Q FslSqj4B80BLSqr41PgoxSvf9qgQuAK98roGE1VWOLiU1uvuxIB5ZrH3H+3p3e/k5n 1K4kuR3SgnmDEMvpXTTjBjf6zSn33HWCtxgrIEKNaGbITHk01uG7AxNu3cYVeVsjUJ VesUndK6otkBjaQP60X4Oz6SQrkoNGXmdcUSP1pCyX0V4hdi0pTx1MUD5/XbnmqmkO eW8ejU1xGzK/j9zzQGVHr1u30Ds7z0M2tfZQyj6/niAbMVP2VBpXUuq1lZVI3kmhsO dmKArDU7ELYSw== Received: by finisterre.sirena.org.uk (Postfix, from userid 1000) id 51EBF1AC57F1; Sun, 08 Feb 2026 22:46:50 +0000 (GMT) Date: Sun, 8 Feb 2026 22:46:50 +0000 From: Mark Brown To: Dave Airlie , DRI Cc: Linux Kernel Mailing List , Linux Next Mailing List , Matthew Brost , Michal Wajdeczko , Rodrigo Vivi , Satyanarayana K V P , Shuicheng Lin , Thomas =?iso-8859-1?Q?Hellstr=F6m?= Subject: linux-next: manual merge of the drm tree with the origin tree Message-ID: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="B62MvGnV4Ep6+BKn" Content-Disposition: inline X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" --B62MvGnV4Ep6+BKn Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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") =66rom the origin tree and commits: fa18290bf0723b ("drm/xe/vf: Shadow buffer management for CCS read/write o= perations") 5d5ef695497950 ("drm/xe: Fix kerneldoc for xe_migrate_exec_queue") =66rom 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 --B62MvGnV4Ep6+BKn Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmmJElkACgkQJNaLcl1U h9C5MQf+IrUNqHN8u1iJNvgbL+Rmuk+uWKvtZkzWNqaBKGwomc9eAUJk7ocSV1cA TuXps/mInmsctnzM89VN3+lLiwDiFg7Ps1TKF5bkcCvKn3WqrV8q0ZRWU9am4oGI /fjLRIO163o/+BJDKXfYE+ifepdP10o9IGcOob4n0Hda2Im8+Y08xfXqVovPL99N bngNPWxUc0nQzdgzgvYKAlZL21cQhSNrIePe95VMbpuqYbtjCL8EID5b6CyhiNIi uB7Ghpz3US7BlCnjVZauHhSNM0uZk0kKQGvCVwaU3itrEfixHBxVH+lTsVVVU8rK 03tQXUgGJC6lHcVfD5CFv25m0U0bBQ== =veOn -----END PGP SIGNATURE----- --B62MvGnV4Ep6+BKn--