lkml.org 
[lkml]   [2018]   [Mar]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the printk tree with the asm-generic tree
On (03/15/18 11:45), Stephen Rothwell wrote:
> Hi Petr,
>
> Today's linux-next merge of the printk tree got a conflict in:
>
> arch/blackfin/kernel/dumpstack.c
>
> between commit:
>
> e7e57f690e38 ("arch: remove blackfin port")
>
> from the asm-generic tree and commit:
>
> 33251b634b4a ("dump_stack: convert generic dump_stack into a weak symbol")
>
> from the printk tree.

If blackfin is gone and nds32 was fixed then we can drop my patch.

-ss

\
 
 \ /
  Last update: 2018-03-15 08:50    [W:0.046 / U:1.132 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site