lkml.org 
[lkml]   [2012]   [Mar]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: linux-next: manual merge of the akpm tree with the tip tree
    On 03/26/2012 12:01 PM, Stephen Rothwell wrote:
    > Hi all,
    >
    > Today's linux-next merge of the akpm tree got a conflict in between
    > commit a6fca40f1d7f ("x86, tlb: Switch cr3 in leave_mm() only when
    > needed") from the tip tree and commit "x86: use this_cpu_xxx to replace
    > percpu_xxx funcs" from the akpm tree.
    >
    > I fixed it up (see below) and can carry the fix as necessary.
    Thanks!


    \
     
     \ /
      Last update: 2012-03-26 07:25    [W:0.019 / U:1.524 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site