lkml.org 
[lkml]   [2011]   [May]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: linux-next: manual merge of the dwmw2-iommu tree with Linus' tree
    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



    \
     
     \ /
      Last update: 2011-05-25 10:07    [W:3.284 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site