Messages in this thread | | | From | Linus Torvalds <> | Date | Thu, 9 Nov 2023 13:47:11 -0800 | Subject | Re: [git pull] IOMMU Updates for Linux v6.7 |
| |
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").
Holler if something looks odd.
Linus
| |