lkml.org 
[lkml]   [2010]   [Oct]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the xen tree with the tip tree
    Hi all,

    Today's linux-next merge of the xen tree got a conflict in
    arch/x86/mm/init_32.c between commit
    1d931264af0f10649b35afa8fbd2e169da51ac08 ("x86-32, memblock: Make
    add_highpages honor early reserved ranges") from the tip tree and commit
    07147a06ac3b1b028124ea00ba44e69eb8ea7685 ("x86/32: honor reservations of
    high memory") from the xen tree.

    I have no idea how to fix this up, sorry, so I have used the xen tree
    from next-20101021 for today.

    There were also conflicts in:
    arch/x86/xen/mmu.c
    include/linux/early_res.h
    kernel/early_res.c

    These last two were deleted in the tip tree.
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    http://www.canb.auug.org.au/~sfr/
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2010-10-22 05:07    [W:0.038 / U:31.104 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site