lkml.org 
[lkml]   [2009]   [May]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the x86 tree with Linus' tree
    Hi all,

    Today's linux-next merge of the x86 tree got a conflict in
    arch/x86/boot/memory.c between commit
    bca23dba760d6705c013f89113c46570378fb626 ("x86, setup: revert ACPI 3 E820
    extended attributes support") from Linus' tree and commit
    df7699c56421c0476704f24a43409ac8c505f3d2 ("x86, setup: "glove box" BIOS
    interrupts in the core boot code") from the x86 tree.

    The former removed the code that the latter modified, so I used the
    former (as is done in -tip).
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    http://www.canb.auug.org.au/~sfr/
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2009-05-26 02:55    [W:0.019 / U:245.612 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site