Hi all,
On Tue, 12 Jun 2018 10:46:07 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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
Attachment:
pgpdLyQvyFXGF.pgp
Description: OpenPGP digital signature
