* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi Ingo,
>
> Today's linux-next merge of the iommu tree got a conflict in
> arch/x86/kernel/Makefile between commit
> b43d196c4d3fe46d6dda7c987c47792612b80b1b ("x86: corruption-check: some
> post-move cleanups") from Linus' tree and commit
> cfb80c9eae8c7ed8f2ee81090062d15ead51cbe8 ("x86: unify pci iommu setup and
> allow swiotlb to compile for 32 bit") from the iommu tree.
>
> Simply overlapping additions. I fixed it up (see below) and can carry
> the fix as necessary.
had a resolution for this cached from tip/master - so i just re-integrated
and re-pushed auto-iommu-next so it should go away next time you pick it
up. Thanks,
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
