lkml.org 
[lkml]   [2018]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [git pull] IOMMU Updates for Linux v4.19
On Fri, Aug 24, 2018 at 6:01 AM Joerg Roedel <joro@8bytes.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

\
 
 \ /
  Last update: 2018-08-24 22:15    [W:0.146 / U:0.044 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site