From: Jason Gunthorpe <jgg@nvidia.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>,
linux-kernel@vger.kernel.org, iommu@lists.linux.dev
Subject: Re: [git pull] IOMMU Updates for Linux v6.7
Date: Thu, 9 Nov 2023 18:45:46 -0400 [thread overview]
Message-ID: <20231109224546.GK4488@nvidia.com> (raw)
In-Reply-To: <CAHk-=wjHyBy2Mttaj8kySJBpZ9hUiCe09ZJPo8trCRHfhi7NBg@mail.gmail.com>
On Thu, Nov 09, 2023 at 01:47:11PM -0800, Linus Torvalds wrote:
> On Mon, 6 Nov 2023 at 08:43, Joerg Roedel <joro@8bytes.org> wrote:
> >
> > There are conflicts with the current upstream code, mainly
> > from iommufd changes. My resolution is attached.
>
> Hmm. My resolution is slightly different. In particular, in the
> selftest code, I removed mock_domain_alloc() entirely in favor of
> mock_domain_alloc_paging(), the same way commit 13fbceb1b8e9
> ("iommufd: Convert to alloc_domain_paging()") did.
>
> That not only seems to logically match that change, it also matches
> what I think Jason (cc'd) intended with commit b2b67c997bf7 ("iommufd:
> Organize the mock domain alloc functions closer to Joerg's tree").
I ran through the merge using my for-linus-iommufd-merged tag and I
got the same as your tree, so it looks good!
Thanks,
Jason
next prev parent reply other threads:[~2023-11-09 22:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-06 16:43 [git pull] IOMMU Updates for Linux v6.7 Joerg Roedel
2023-11-09 21:47 ` Linus Torvalds
2023-11-09 22:45 ` Jason Gunthorpe [this message]
2023-11-09 21:48 ` pr-tracker-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231109224546.GK4488@nvidia.com \
--to=jgg@nvidia.com \
--cc=iommu@lists.linux.dev \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox