Messages in this thread | | | Date | Thu, 15 Mar 2018 16:50:06 +0900 | From | Sergey Senozhatsky <> | Subject | 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 ("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
| |