lkml.org 
[lkml]   [2018]   [Jan]   [14]   [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 kspp tree
Hi Andrew,

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

arch/cris/include/arch-v10/arch/bug.h

between commit:

c8133e59edb0 ("cris: Mark end of BUG() implementation as unreachable")

from the kspp tree and commit:

c5a1e183a75a ("bug.h: work around GCC PR82365 in BUG()")

from the akpm-current tree.

I fixed it up (I just used the akpm-current tree version) 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

\
 
 \ /
  Last update: 2018-01-15 05:57    [W:0.036 / U:3.868 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site