On Fri, Aug 24, 2018 at 6:01 AM Joerg Roedel wrote:
>
> note that this time there is a trivial conflict when merging this into
> your tree. The conflict is in drivers/iommu/ipmmu-vmsa.c, apparently
> some other tree also added DT matching entries there.
No, the IOMMU_OF_DECLARE() thing went away
Hi Linus,
note that this time there is a trivial conflict when merging this into
your tree. The conflict is in drivers/iommu/ipmmu-vmsa.c, apparently
some other tree also added DT matching entries there. With that in mind:
The following changes since commit
