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 273F9E81BD7 for ; Mon, 9 Feb 2026 15:23:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CFD3A10E421; Mon, 9 Feb 2026 15:23:06 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=permerror (0-bit key) header.d=shazbot.org header.i=@shazbot.org header.b="FEf0h2Bc"; dkim=permerror (0-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="fVLT4mfc"; dkim-atps=neutral Received: from fhigh-b3-smtp.messagingengine.com (fhigh-b3-smtp.messagingengine.com [202.12.124.154]) by gabe.freedesktop.org (Postfix) with ESMTPS id 18B2810E8E2; Thu, 5 Feb 2026 14:42:11 +0000 (UTC) Received: from phl-compute-02.internal (phl-compute-02.internal [10.202.2.42]) by mailfhigh.stl.internal (Postfix) with ESMTP id F0A547A0066; Thu, 5 Feb 2026 09:42:08 -0500 (EST) Received: from phl-imap-18 ([10.202.2.89]) by phl-compute-02.internal (MEProxy); Thu, 05 Feb 2026 09:42:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shazbot.org; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1770302528; x=1770388928; bh=c2sWSFRwhN1ePbWw0hSzzDPUGT+PUV51S0w9MOaIyks=; b= FEf0h2BcDcZm7G7BDIUK2ADItpwlJ8hNuUMLpKhFD6n01D8okyPnIkq6p81we7L2 gIGJ48i+i29M8SF5Umc+j2/hErScJ0HodPUYKew263UE3GLZrJ7hD+mpi7tA1tUX CroIkGk60T8vo4V9I7Cfhb2SMhUSeAwP0kh/1pkZh1xJdlexYo0FdJ5ZcBnF22Gt PcO5FnudagrbQTbq0nW/uUj4MwbWv0LJvy4TiBkSF9/3dPJ/dW8TAz3yrrKGyEcx SXgih4Qq3eCnWAJL/lyYSLwmbXucwl6AUKa54xqHfBzVVIvuk+of2gbkMwwAHZlf LV4/00+M10ZETI1nm733Ig== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1770302528; x= 1770388928; bh=c2sWSFRwhN1ePbWw0hSzzDPUGT+PUV51S0w9MOaIyks=; b=f VLT4mfcVhduoy9qAwuHpxbxsvmL9WGkexpwwI35BBhmw8JlDnXBk4zHMMQX1hHA6 4z5QJMxDN/5SU6v2/oB5bORew2XZ927YqZSyGTD1rcl9RdbaPe9yUSI2BgRvAFmc BzOn8OvFG5gzR5jsTizMM+6Q1M4c3zFzIFNxlcJnGt15yhJ9kNlOoAJxgBhI4IXo HYOdBlgGo0Cb+dwdnPpC3xPczHpGadbVzQgJTrwGwpj8XbRm5Jx/FcIuWT1z2tvu m1hBZ0WCbh+BnVOK3X+cMcFnDmQXkToA8t1ygsnVaHAwifuFcHKpaN9hF3Ey5zw0 8BX3dnHzbNHviUYX1vBgw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefgedrtddtgddukeehheeiucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhepofggfffhvfevkfgjfhfutgfgsehtqhertdertdejnecuhfhrohhmpedftehlvgig ucghihhllhhirghmshhonhdfuceorghlvgigsehshhgriigsohhtrdhorhhgqeenucggtf frrghtthgvrhhnpefgleegjeehkeefkefhkeetjedugfdvtdduveehledtteeltedtveff ffegheelffenucffohhmrghinhepfhhrvggvuggvshhkthhophdrohhrghenucevlhhush htvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegrlhgvgiesshhhrgii sghothdrohhrghdpnhgspghrtghpthhtohepfeehpdhmohguvgepshhmthhpohhuthdprh gtphhtthhopehjohhroheskegshihtvghsrdhorhhgpdhrtghpthhtohepfhgvlhhigidr khhuvghhlhhinhhgsegrmhgurdgtohhmpdhrtghpthhtoheprghlvgigrghnuggvrhdrug gvuhgthhgvrhesrghmugdrtghomhdprhgtphhtthhopegthhhrihhsthhirghnrdhkohgv nhhighesrghmugdrtghomhdprhgtphhtthhopehrohgsihhnrdhmuhhrphhhhiesrghrmh drtghomhdprhgtphhtthhopehguhhrtghhvghtrghnshhinhhghhestghhrhhomhhiuhhm rdhorhhgpdhrtghpthhtohepughmihhtrhihrdhoshhiphgvnhhkohestgholhhlrggsoh hrrgdrtghomhdprhgtphhtthhopehsihhmohhnrgesfhhffihllhdrtghhpdhrtghpthht oheprghirhhlihgvugesghhmrghilhdrtghomh X-ME-Proxy: Feedback-ID: i03f14258:Fastmail Received: by mailuser.phl.internal (Postfix, from userid 501) id A92B615C0090; Thu, 5 Feb 2026 09:42:07 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface MIME-Version: 1.0 X-ThreadId: ATdnKwv6RJ4o Date: Thu, 05 Feb 2026 07:41:11 -0700 From: "Alex Williamson" To: =?UTF-8?Q?Christian_K=C3=B6nig?= , "Jason Gunthorpe" , "Leon Romanovsky" Cc: "Simona Vetter" , "Jani Nikula" , "Lucas De Marchi" , "Sumit Semwal" , "Alex Deucher" , "David Airlie" , "Gerd Hoffmann" , "Dmitry Osipenko" , "Gurchetan Singh" , "Chia-I Wu" , "Maarten Lankhorst" , "Maxime Ripard" , "Thomas Zimmermann" , =?UTF-8?Q?Thomas_Hellstr=C3=B6m?= , "Rodrigo Vivi" , "Kevin Tian" , "Joerg Roedel" , "Will Deacon" , "Robin Murphy" , "Felix Kuehling" , "Ankit Agrawal" , "Vivek Kasireddy" , linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, virtualization@lists.linux.dev, intel-xe@lists.freedesktop.org, linux-rdma@vger.kernel.org, iommu@lists.linux.dev, kvm@vger.kernel.org Message-Id: <1b7ee5ad-6dde-415a-8e06-93daddc9bcef@app.fastmail.com> In-Reply-To: References: <20260131-dmabuf-revoke-v7-0-463d956bd527@nvidia.com> <20260131-dmabuf-revoke-v7-7-463d956bd527@nvidia.com> <20260204095659.5a983af2@shazbot.org> <20260205121945.GC12824@unreal> <20260205142111.GK2328995@ziepe.ca> Subject: Re: [PATCH v7 7/8] vfio: Permit VFIO to work with pinned importers Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Mailman-Approved-At: Mon, 09 Feb 2026 15:22:58 +0000 X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On Thu, Feb 5, 2026, at 7:28 AM, Christian K=C3=B6nig wrote: > On 2/5/26 15:21, Jason Gunthorpe wrote: >> On Thu, Feb 05, 2026 at 02:19:45PM +0200, Leon Romanovsky wrote: >>> You don't need any backmerge, SHA-1 version of vfio-v6.19-rc8 tag is= the >>> same as in Linus's tree, so the flow is: >>=20 >> I'm confused what is the problem here? >>=20 >> From https://anongit.freedesktop.org/git/drm/drm-misc >> * branch drm-misc-next -> FETCH_HEAD >>=20 >> $ git show FETCH_HEAD >> commit 779ec12c85c9e4547519e3903a371a3b26a289de >> Author: Alexander Konyukhov >> Date: Tue Feb 3 16:48:46 2026 +0300 >>=20 >> drm/komeda: fix integer overflow in AFBC framebuffer size check >>=20 >> $ git merge-base FETCH_HEAD 61ceaf236115f20f4fdd7cf60f883ada1063349a >> 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 >> $ git describe --contains 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 >> v6.19-rc6^0 >>=20 >> $ git log --oneline 61ceaf236115f20f4fdd7cf60f883ada1063349a ^FETCH_H= EAD >> 61ceaf236115f2 vfio: Prevent from pinned DMABUF importers to attach t= o VFIO DMABUF >>=20 >> Just pull Alex's tree, the drm-misc-next tree already has v6.19-rc6, >> so all they will see is one extra patch from Alex in your PR. >>=20 >> No need to backmerge, this is normal git stuff and there won't be >> conflicts when they merge a later Linus tag. > > Correct, but that would merge the same patch through two different=20 > trees. That is usually a pretty big no-go. Applying the patch through two different trees is a no-go, but merging t= he same commit from a shared branch or tag is very common and acceptable= . It's the same commit after all, there is no conflict, no duplicate co= mmit. When the trees are merged, the commit will exist once in the log.= Thanks, Alex