[lkml]   [2016]   [Nov]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the powerpc tree with the powerpc-fixes tree
Stephen Rothwell <> writes:

> 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.

Thanks. I'm planning to merge fixes into next RSN ... as soon as people
stop finding bugs.


 \ /
  Last update: 2016-11-24 03:40    [W:0.028 / U:4.292 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site