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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20180315125252.2igbbslfrmtp6kqq@pathway.suse.cz>
Date:   Thu, 15 Mar 2018 13:52:52 +0100
From:   Petr Mladek <pmladek@...e.com>
To:     Sergey Senozhatsky <sergey.senozhatsky.work@...il.com>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Arnd Bergmann <arnd@...db.de>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
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