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

    Today's linux-next merge of the tip tree got a conflict in
    arch/sparc/kernel/smp_32.c between commit d6d048192b1d ("sparc32:
    implement SMP IPIs using the generic functions") from the sparc tree and
    commit 184748cc50b2 ("sched: Provide scheduler_ipi() callback in response
    to smp_send_reschedule()") from the tip tree.

    I fixed it up (I am pretty sure that the sparc tree patch supercedes the
    tip tree one) and can carry the fix as necessary.
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    http://www.canb.auug.org.au/~sfr/
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2011-05-17 05:17    [W:0.020 / U:1.340 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site