From: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Petr Mladek <pmladek@suse.com>, Arnd Bergmann <arnd@arndb.de>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Subject: Re: linux-next: manual merge of the printk tree with the asm-generic tree
Date: Thu, 15 Mar 2018 16:50:06 +0900 [thread overview]
Message-ID: <20180315075006.GC3628@jagdpanzerIV> (raw)
In-Reply-To: <20180315114500.65daa865@canb.auug.org.au>
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
next prev parent reply other threads:[~2018-03-15 7:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-15 0:45 linux-next: manual merge of the printk tree with the asm-generic tree Stephen Rothwell
2018-03-15 7:50 ` Sergey Senozhatsky [this message]
2018-03-15 12:52 ` Petr Mladek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180315075006.GC3628@jagdpanzerIV \
--to=sergey.senozhatsky.work@gmail.com \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pmladek@suse.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox