lkml.org 
[lkml]   [2012]   [Jun]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the tip tree with Linus' tree
    Hi all,

    Today's linux-next merge of the tip tree got a conflict in
    include/asm-generic/bug.h between commit 09682c1dd382 ("bug.h: Fix up
    CONFIG_BUG=n implicit function declarations") from Linus' tree and commit
    7b37393f13d5 ("bug.h: Fix x86 !CONFIG_BUG build regression") from the tip
    tree.

    These are trying to do the same thing, so I used the version from Linus'
    tree.
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2012-06-26 07:21    [W:0.023 / U:0.016 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site