Re: [git pull] IOMMU Updates for Linux v4.19

[Linus Torvalds]

On Fri, Aug 24, 2018 at 6:01 AM Joerg Roedel <joro@xxxxxxxxxx> 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 entirely, so my merge
removes the entries your branch added..

They should be unnecessary, but I obviously can't test that driver, so
people should check that out.

           Linus