[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CA+55aFz08bncAD=Q_1NO87YO_z9rTkUShSZ0V2wCMRSNY_WH4w@mail.gmail.com>
Date: Fri, 24 Aug 2018 13:14:07 -0700
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Joerg Roedel <joro@...tes.org>,
Jacopo Mondi <jacopo+renesas@...ndi.org>,
Simon Horman <horms+renesas@...ge.net.au>,
Magnus Damm <damm+renesas@...nsource.se>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
"open list:AMD IOMMU (AMD-VI)" <iommu@...ts.linux-foundation.org>
Subject: Re: [git pull] IOMMU Updates for Linux v4.19
On Fri, Aug 24, 2018 at 6:01 AM Joerg Roedel <joro@...tes.org> 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
Powered by blists - more mailing lists