From nobody Fri Apr 3 19:30:06 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F060E3AA1BB; Mon, 23 Mar 2026 16:11:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774282271; cv=none; b=IxynRcMNjT+t9JwpVIr53jzuulSy9kgPohJ11YtUdo78CALjs7m/IqbRfiiP1II5FHItgrGoJL2sxz4XB40gz0a0C7jTBaNf0h8jJQuxehWS6fyQkKFO8+NV5l6fpkoSyS1Vousb1CMkWCp5UFBG9i7NKWdslZib9tqileGO1Dc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774282271; c=relaxed/simple; bh=BcDYyj49bw4n/hc4XnOoc/hEdS+K+t7CoHp7vPgOvQ0=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=diLHh36iy/Ue+g3XQGiHjw1/kosBXXtalzBii/eBF0/UFiu+7sZb2typt+bhwbs/enzLXkCjm/9JKYWo0IvO+nOxkRejHpycGrSLrarmuLkc+OUvcBGMzkfL3cmJxvNfMPKeZY6FIAgiXuy8pQQ1g/U9a9cvznmcPsBlVwhIumQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GcOE6xw/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="GcOE6xw/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 731C7C4CEF7; Mon, 23 Mar 2026 16:11:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774282270; bh=BcDYyj49bw4n/hc4XnOoc/hEdS+K+t7CoHp7vPgOvQ0=; h=Date:From:To:Cc:Subject:From; b=GcOE6xw/4F+xKbxUTpT+vsNSIXR+EmttUIhmkuhMnAE2yPZOe0tb2ttUNZZaF+ZjY MOabgFz/rLQzk3IbcvE57bj8opGYN0JF+DY2PorHkAvyI37aOrxgpYFdqi3vkmoPQa HaNRLyUuQ3+FDRDb3k071DAIIYgM0ckX7qyHZt/9VE/MhfJBqTPOq4I2jVdxc6spxz 8odF+m1z7ixytEx26qnN2NZ8fOcn44sQN3p21Q//vXw+CoU8gNfYwPSTFFWwuXohgj YIVILUrEx+vfYnW8UhhMme80BKCPoz/bX6x5aWCn4feK5Sy0+8CUOlAFwBj8zJl5hS 6LkgOSImj+E9A== Date: Mon, 23 Mar 2026 16:11:06 +0000 From: Mark Brown To: Thomas =?iso-8859-1?Q?Hellstr=F6m?= , DRM XE List Cc: Linux Kernel Mailing List , Linux Next Mailing List , Matthew Brost , Zhanjun Dong Subject: linux-next: manual merge of the drm-xe tree with the origin tree Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="x4w9fyO9O0Hv+qc4" Content-Disposition: inline --x4w9fyO9O0Hv+qc4 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Hi all, Today's linux-next merge of the drm-xe tree got a conflict in: drivers/gpu/drm/xe/xe_guc_submit.c between commit: e0f82655df6fb ("drm/xe: Trigger queue cleanup if not in wedged mode 2") from the origin tree and commits: e25ba41c8227c ("drm/xe: Trigger queue cleanup if not in wedged mode 2") a7f607610da72 ("drm/xe: Use XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET enum in= stead of magic number") 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 --combined drivers/gpu/drm/xe/xe_guc_submit.c index cb32053d57ecd,a145234f662b5..0000000000000 --- a/drivers/gpu/drm/xe/xe_guc_submit.c +++ b/drivers/gpu/drm/xe/xe_guc_submit.c @@@ -1334,12 -1334,13 +1334,13 @@@ void xe_guc_submit_wedge(struct xe_guc=20 if (!guc->submission_state.initialized) return; =20 - if (xe->wedged.mode =3D=3D 2) { + if (xe->wedged.mode =3D=3D XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET) { err =3D devm_add_action_or_reset(guc_to_xe(guc)->drm.dev, guc_submit_wedged_fini, guc); if (err) { - xe_gt_err(gt, "Failed to register clean-up on wedged.mode=3D2; " - "Although device is wedged.\n"); + xe_gt_err(gt, "Failed to register clean-up on wedged.mode=3D%s; " + "Although device is wedged.\n", + xe_wedged_mode_to_string(XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET)); return; } =20 --x4w9fyO9O0Hv+qc4 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEyBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmnBZhoACgkQJNaLcl1U h9AwYQf4yiwz8BPXaNwYn2lhzwpfcNviHcRIPottkR80+U0yKg+sbkjARSr2br0C 2ci7tHbQutaBh4BNiWRmYk9m6j+/bhG//kuGzRq5UWHNpcXu+BoqtjXc59Mm6nt0 uOmdyfYcNW0i7QRlAKDhU2aiGucprKYslLOByoJo0Sv9lFd4+y9pyMd1G3tPpqmR TApNT52hJh1x2DTaiqDbIOFsuI6Bv8dusR5qV/t29cjz7egN8zfu+mc4ZcV9LZzS y51EWePQRgPedz9DfVP26YENKEOcsM0Gzg5p0NoitYhJ6tmo1rNe5TpF7jLA44lD a+z7hZsskeIFWFoZTONbG0hst7bj =sM9S -----END PGP SIGNATURE----- --x4w9fyO9O0Hv+qc4--