From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qv1-f66.google.com (mail-qv1-f66.google.com [209.85.219.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61D8141C316 for ; Thu, 5 Feb 2026 14:58:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.66 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770303527; cv=none; b=hInK6RPDY2s9zaJwqPq2aXvVU0M8oHG2//eDfjea5jwfslXRInUf2i7gHMsdni+OCX2Gk+8wE3xLgbZ3GzroN/vMc7CsbC4qb5oCrIHp4kgxsWSOtY2fZ1Lx3iAc9O/SVetcxMROjdShuEi7pL0pQdq4yfsmNUSPreVlYCXkFvM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770303527; c=relaxed/simple; bh=r4B2Ie8qQ9e+bddAPy/IrxMyxgCLdGouLxcA6jhMbCY=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=L+LDZ8oN/DvGw1SvIw9bl6VLgy8C4rqIjT3crDV6ac9cQEnbgQZUYfR0t4iX/yuHTdkZXteIB3KHWVAI7xR+BUFqXkNlDyrqmF9SxPvWnptR+828+aA8JH8KGZENm9qOAHzhC3NVDq4GmRYFipoyH73nN0wtOxXd9Hua1nKMbZ4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ziepe.ca; spf=pass smtp.mailfrom=ziepe.ca; dkim=pass (2048-bit key) header.d=ziepe.ca header.i=@ziepe.ca header.b=i1JLIViS; arc=none smtp.client-ip=209.85.219.66 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ziepe.ca Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ziepe.ca Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ziepe.ca header.i=@ziepe.ca header.b="i1JLIViS" Received: by mail-qv1-f66.google.com with SMTP id 6a1803df08f44-895071c5527so13660906d6.1 for ; Thu, 05 Feb 2026 06:58:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; t=1770303526; x=1770908326; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=6paZ1/dfF6ZJkTrV436UqQ3Veg/Kl0esrhdcHdeVKCQ=; b=i1JLIViSZyg9JmiQN9fxVXsiYybSALi2vY+h68TUZ0OV/iIqVwWZRRhWt4H4dAcruC 1i+pwaEaMqa57MqN90cVZt0MfBHW8Tj1osq2pqqmDhjT0Z7tSaSEVUKtQetugOK1tAeE 3FBk14xY6abiw7keBtBmEImVaTb7z6Lz6UPMlPZ4nMWBFAyMHXF/zGrF2gi63Axb1mIW CWxS8XdzmLR3dJRWiH5lPUnU+AoTeVpLYTfg4EhmcXTraVToOqdIuU991XYnC9TCb0FX xQDtvL9jPqwYkvj11cK4xOgrbX8zFxsfixd+4pi5h24blIbPPavxhxs8yeCENJhoSjdL XhZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770303526; x=1770908326; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6paZ1/dfF6ZJkTrV436UqQ3Veg/Kl0esrhdcHdeVKCQ=; b=B3Hb7bCrfsw9SLYX0iJOKDaay9pajBPDpN2POGkgnNHWWD38ZJ2uinfV0Ybs47lNqn fHpNruOKOnIWGXFJ0RtJUKXTzzdO+NhSvjWEQil9jjfDPBpolC8KhjZ4PCoebeNNT8HX WodoeEJNXyDwPo3Q4zZYQaSVzsZJpe4xmtvm+PFS3eAL+RxhADhWOCDSegcp7JfTl8gp BkieY//VGrwDyvzLtoANjFlpqXtEHs+Pr5sLfMYoMOZG2SUTIJno7JlqxzAhUUhF6I0F DU3Maz/NzoqBi9xynrFqupFdQ1WPHX7Mx8Smdh1xkyzo5cTduljJYUn2FAocQvHMpiRU 9r6g== X-Forwarded-Encrypted: i=1; AJvYcCWXYkhQrHT+kSo8qAryramlFwNk3kxuTmI93zoa6OoWqys8XjmQxV9la1GaWgQrrOjfiux0L/cjnErAFyA=@vger.kernel.org X-Gm-Message-State: AOJu0YyF9ULSRveDwO4S26Uri0AA1N2K0QwQjlVcQ6F7IC3BCislhg3m lZlAxR8GTB3kGvP4K9T6fACwbog3bsTa3N5M+rNjlo7JMBVGdQHekDjuQIAbyEm2LZE= X-Gm-Gg: AZuq6aK+yWdOe8+Yrkl9KTsR80br1JHWiPV52SN9EF9pnq8V38X/FZ0CphMs384PMME WfTDD8AuJwX7+Bx6QB/IXitzOE+N2AOSxSmAvnwfsTBBDJVvMb0aO/PNhBnZaTMjhtiOAoWv8KY dX5zi0jSgIeUdb95HFQzJqNNSQ/b0LwyoVBs7vgURtRn9jOVmr0tw62hNDjHzRpLW7O+k6ZmRlP 3jKRd/CAAGqIbjeM7NN68r04zq+ewA453qwSU7LX0FRRPpsX2anq2Qlxsu2EpC1yvsHFnfHdlsb fgW+TZpAf8IAG8i97h8Jcnmxi4vNecls5rg4sKUuqkhu0Wd2/CVnPqUbEzOURLdhgmRQeb4yQ1R TFgx+6c6jbXuIjhiZC+PJ6tTRtOnlyRhaROYS7RUDREu5K9yZ49CLhRZ6LhP7V8Ven/s7DmsCoL tyfusV7mRZjBILJTYc9ZFz4zU3UeWB6A6mgTzKqw2xImxnEvqrIs8I1vH0BXRcYqWP44s= X-Received: by 2002:ad4:5bc1:0:b0:894:6d0b:502 with SMTP id 6a1803df08f44-895221eff32mr95805386d6.59.1770303526139; Thu, 05 Feb 2026 06:58:46 -0800 (PST) Received: from ziepe.ca (hlfxns017vw-142-162-112-119.dhcp-dynamic.fibreop.ns.bellaliant.net. [142.162.112.119]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-89521bffb41sm43278866d6.4.2026.02.05.06.58.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Feb 2026 06:58:45 -0800 (PST) Received: from jgg by wakko with local (Exim 4.97) (envelope-from ) id 1vo0of-00000000zky-02N9; Thu, 05 Feb 2026 10:58:45 -0400 Date: Thu, 5 Feb 2026 10:58:44 -0400 From: Jason Gunthorpe To: Alex Williamson Cc: Christian =?utf-8?B?S8O2bmln?= , Leon Romanovsky , 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 , Thomas =?utf-8?Q?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 Subject: Re: [PATCH v7 7/8] vfio: Permit VFIO to work with pinned importers Message-ID: <20260205145844.GM2328995@ziepe.ca> 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> <1b7ee5ad-6dde-415a-8e06-93daddc9bcef@app.fastmail.com> 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 In-Reply-To: <1b7ee5ad-6dde-415a-8e06-93daddc9bcef@app.fastmail.com> On Thu, Feb 05, 2026 at 07:41:11AM -0700, Alex Williamson wrote: > >> From https://anongit.freedesktop.org/git/drm/drm-misc > >> * branch drm-misc-next -> FETCH_HEAD > >> > >> $ git show FETCH_HEAD > >> commit 779ec12c85c9e4547519e3903a371a3b26a289de > >> Author: Alexander Konyukhov > >> Date: Tue Feb 3 16:48:46 2026 +0300 > >> > >> drm/komeda: fix integer overflow in AFBC framebuffer size check > >> > >> $ git merge-base FETCH_HEAD 61ceaf236115f20f4fdd7cf60f883ada1063349a > >> 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 > >> $ git describe --contains 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 > >> v6.19-rc6^0 > >> > >> $ git log --oneline 61ceaf236115f20f4fdd7cf60f883ada1063349a ^FETCH_HEAD > >> 61ceaf236115f2 vfio: Prevent from pinned DMABUF importers to attach to VFIO DMABUF > >> > >> 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. > >> > >> 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 > > trees. That is usually a pretty big no-go. > > Applying the patch through two different trees is a no-go, but > merging the 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 commit. When the trees are merged, the > commit will exist once in the log. Thanks, +1 This is how shared branches work. There is no issue here. Jason