lkml.org 
[lkml]   [2016]   [Nov]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the powerpc tree with the powerpc-fixes tree
    Hi all,

    Today's linux-next merge of the powerpc tree got a conflict in:

    arch/powerpc/include/asm/asm-prototypes.h

    between commit:

    9e5f68842276 ("powerpc: Fix missing CRCs, add more asm-prototypes.h declarations")

    from the powerpc-fixes tree and commit:

    82de5797a260 ("powerpc: Remove extraneous header from asm-prototypes.h")

    from the powerpc tree.

    I fixed it up (see below) and can carry the fix as necessary. This
    is now fixed as far as linux-next is concerned, but any non trivial
    conflicts should be mentioned to your upstream maintainer when your tree
    is submitted for merging. You may also want to consider cooperating
    with the maintainer of the conflicting tree to minimise any particularly
    complex conflicts.

    --
    Cheers,
    Stephen Rothwell

    diff --cc arch/powerpc/include/asm/asm-prototypes.h
    index e0baba1535e6,dfef1174663e..000000000000
    --- a/arch/powerpc/include/asm/asm-prototypes.h
    +++ b/arch/powerpc/include/asm/asm-prototypes.h
    @@@ -13,12 -13,6 +13,11 @@@
    */

    #include <linux/threads.h>
    - #include <linux/kprobes.h>
    +#include <asm/cacheflush.h>
    +#include <asm/checksum.h>
    +#include <asm/uaccess.h>
    +#include <asm/epapr_hcalls.h>
    +
    #include <uapi/asm/ucontext.h>

    /* SMP */

    \
     
     \ /
      Last update: 2016-11-24 00:46    [W:3.270 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site