On Tue, Sep 26, 2023 at 05:04:28PM +0200, Joerg Roedel wrote: > Hi Niklas, > > On Fri, Aug 25, 2023 at 12:11:15PM +0200, Niklas Schnelle wrote: > > Niklas Schnelle (6): > > iommu: Allow .iotlb_sync_map to fail and handle s390's -ENOMEM return > > s390/pci: prepare is_passed_through() for dma-iommu > > s390/pci: Use dma-iommu layer > > iommu/s390: Disable deferred flush for ISM devices > > iommu/dma: Allow a single FQ in addition to per-CPU FQs > > iommu/dma: Use a large flush queue and timeout for shadow_on_flush > > Turned out this series has non-trivial conflicts with Jasons > default-domain work so I had to remove it from the IOMMU tree for now. > Can you please rebase it to the latest iommu/core branch and re-send? I > will take it into the tree again then. Niklas, I think you just 'take yours' to resolve this. All the IOMMU_DOMAIN_PLATFORM related and .default_domain = parts should be removed. Let me know if you need anything Thanks, Jason
