[lkml]   [2011]   [May]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the dwmw2-iommu tree with Linus' tree

* 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.

David, please do not modify arch/x86/kernel/apic/apic.c but send such
patches to the x86 maintainers!

That particular change was still under discussion and i'm not at all
sure we want to do it like that. So please repost the latest version.



 \ /
  Last update: 2011-05-25 11:19    [W:0.041 / U:1.068 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site