lkml.org 
[lkml]   [2018]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the rcu tree with Linus' tree
Hi all,

On Tue, 12 Jun 2018 10:46:07 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the rcu tree got a conflict in:
>
> drivers/iommu/amd_iommu.c
>
> between commit:
>
> 94c793accacd ("iommu/amd: Hide unused iommu_table_lock")
>
> from Linus' tree and commit:
>
> 1df9bb146146 ("EXP iommu: Placeholder for fix in mainline")
>
> from the rcu tree.

I am still getting this.
--
Cheers,
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2018-06-18 05:49    [W:0.054 / U:0.876 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site