lkml.org 
[lkml]   [2016]   [Apr]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the akpm-current tree with the tip tree
    Hi Andrew,

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

    include/linux/efi.h

    between commit:

    2c23b73c2d02 ("Ard Biesheuvel <ard.biesheuvel@linaro.org>")

    from the tip tree and commit:

    9f2c36a7b097 ("include/linux/efi.h: redefine type, constant, macro from generic code")

    from the akpm-current 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 include/linux/efi.h
    index aa36fb8bea4b,5b1d5c5b4080..000000000000
    --- a/include/linux/efi.h
    +++ b/include/linux/efi.h
    @@@ -21,7 -21,7 +21,8 @@@
    #include <linux/pfn.h>
    #include <linux/pstore.h>
    #include <linux/reboot.h>
    +#include <linux/screen_info.h>
    + #include <linux/uuid.h>

    #include <asm/page.h>


    \
     
     \ /
      Last update: 2016-04-29 08:21    [W:7.026 / U:0.568 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site