From mboxrd@z Thu Jan 1 00:00:00 1970 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 CB5655B1EB; Mon, 19 Jan 2026 16:53:54 +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=1768841634; cv=none; b=WOT+kZe/E0/dczqdkjBlf1yODvHjNkmEC7RQzmULCnsJ4fj+u6+vW8MBJXaLhVHFEtA+QZgy02FTLya1fs5vtOsAUl8wXZJslqKKyFFMb4DhipIPggiDkPBdEIFKb3zljn9wFeP+Mg62R8chIgxcKWJROQeuwC2pyB/9dUU4H0g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768841634; c=relaxed/simple; bh=AJquatnu3rVRP9y4tSNmcDyNY34vgNG0lveCEyGdIko=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=l2eHCFA7cT2PC22REeqAeW0MYzCZCVqHvEfxobsOkx68w3Fvu6g8Vx38trWKucKEvQ42B6bcFLA2nnAKhNIlx5z8C1XAg0XVbJB7craE1HKDeO+plOyNYW8lhAzS1A6owXQcyEcpJSrk07Eiu4NErf9WtTjMIRLSxXK0BK4uwyM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=brK4jAqp; 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="brK4jAqp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 565F0C19424; Mon, 19 Jan 2026 16:53:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1768841634; bh=AJquatnu3rVRP9y4tSNmcDyNY34vgNG0lveCEyGdIko=; h=Date:From:To:Cc:Subject:From; b=brK4jAqpyj3AJrN0R6ZNHcCOTRwupCs2lr+lMY7m1IFdWb/SUfVQ/Ukz9r0pgsNDa d64wNp0npUjfVPh9Twzk3hgsNiDDlCK/R2Qo2XnK43E+WnzXzZf1eM3LdNWM0P1xLD YuBVkSqIDYTuftZpWcTpasr4nen39bS/d37COB1y9Yvf5JX6/zSf+mwQGYKc/pUYx9 dpg1FLvGFnqKPEGMZRjmZeLdrPW+3Kc22CuBT+wP13lyZC5KdVw656uQxBzp0UzC/0 iILsRA5sxlH+i0O3/LpUvN+5XHHUasXUBDFupHu4PMSniZTUpRYFDLUEpc4Hf2UlpJ 9qcUvSsP6EYRg== Date: Mon, 19 Jan 2026 16:53:50 +0000 From: Mark Brown To: Dave Airlie , DRI Cc: Linux Kernel Mailing List , Linux Next Mailing List , Matthew Brost , Thomas =?iso-8859-1?Q?Hellstr=F6m?= Subject: linux-next: manual merge of the drm 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: text/plain; charset=us-ascii Content-Disposition: inline Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/drm_pagemap.c between commit: 754c232384386 ("drm/pagemap, drm/xe: Ensure that the devmem allocation is idle before use") from the origin tree and commits: 75af93b3f5d0a ("drm/pagemap, drm/xe: Support destination migration over interconnect") ec265e1f1cfcc ("drm/pagemap: Support source migration over interconnect") 3902846af36be ("drm/pagemap Fix error paths in drm_pagemap_migrate_to_devmem") 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/drm_pagemap.c index 06c1bd8fc4d17,03ee39a761a41..0000000000000 --- a/drivers/gpu/drm/drm_pagemap.c +++ b/drivers/gpu/drm/drm_pagemap.c