Re: linux-next: manual merge of the printk tree with the asm-generic tree

On Thu 2018-03-15 16:50:06, Sergey Senozhatsky wrote: > 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 black

Re: 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

linux-next: manual merge of the printk tree with the asm-generic tree

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