lkml.org 
[lkml]   [2012]   [Nov]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    Date
    SubjectRe: linux-next: manual merge of the akpm tree with the signal tree
    On 26 November 2012 13:08, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
    > Today's linux-next merge of the akpm tree got a conflict in
    > arch/arm64/kernel/sys_compat.c arch/arm64/include/asm/unistd.h between
    > commit 8709876911bd ("arm64: sanitize copy_thread(), switch to generic
    > fork/vfork/clone") from the signal tree and commit "compat: generic
    > compat_sys_sched_rr_get_interval() implementation" from the akpm tree.
    >
    > I fixed it up (see below) and can carry the fix as necessary (no action
    > is required).

    Looks fine to me. Thanks.

    --
    Catalin


    \
     
     \ /
      Last update: 2012-11-26 18:01    [W:4.314 / U:0.176 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site