lkml.org 
[lkml]   [2011]   [Aug]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: linux-next: manual merge of the xen tree with the tip tree
    On 08/25/2011 11:13 AM, Jeremy Fitzhardinge wrote:
    > On 08/24/2011 09:24 PM, Stephen Rothwell wrote:
    >> Hi all,
    >>
    >> Today's linux-next merge of the xen tree got a conflict in
    >> arch/x86/include/asm/spinlock.h between a series of commits from the tip
    >> tree and a smaller series of similar commits from the xen tree.
    >>
    >> I see that Linus is commenting on these patches at the moment, and its
    >> not easy to resolve the conflicts, so I will just use the xen tree from
    >> next-20110824 for today.
    >>
    >
    > Thanks Stephen; the xen tree ones are more current, and I want to make
    > sure I didn't screw up any of the cmpxchg/xadd changes in a wider test env.
    >

    Stephen: the x86/spinlocks branch in the -tip tree is obsolete and
    should be dropped.

    -hpa



    \
     
     \ /
      Last update: 2011-08-25 20:29    [W:0.023 / U:190.336 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site