Messages in this thread | | | Date | Thu, 15 Mar 2018 13:52:52 +0100 | From | Petr Mladek <> | Subject | 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 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.
I have just dropped the patch.
Thanks, Petr
| |