Re: linux-next: manual merge of the dwmw2-iommu tree with Linus'tree

[Youquan Song]

On Wed, May 25, 2011 at 01:00:04PM +1000, Stephen Rothwell wrote:
> Hi David,
> 
> Today's linux-next merge of the dwmw2-iommu tree got a conflict in
> arch/x86/kernel/apic/apic.c between commit 31dce14a3269 ("x86, ioapic:
> Use ioapic_saved_data while enabling intr-remapping") from Linus' tree and
> commit 6a87c5ec6463 ("intel-iommu: enable x2apic opt out") from the
> dwmw2-iommu tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

The fix looks good to me.

Thanks
-Youquan

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/