Hi all,

On Tue, 6 Mar 2018 13:43:26 +0100 Petr Mladek <pmla...@suse.com> wrote:
> Greentime Hu,
> the for-4.17 branch in printk.git is based on Linus' tree. Therefore
> I had to remove the hunk against arch/nds32/kernel/traps.c because
> this file is only in linux-next.
> I think that it might be easier if you remove the EXPORT_SYMBOL()
> in your branch. Is it OK for you, please?

I have added the following as a merge resolution to the linux-next
merge of the printk tree from today (someone will need to mention this
to Linus when the printk and nds32 trees meet in Linus' tree):

From: Stephen Rothwell <s...@canb.auug.org.au>
Date: Wed, 7 Mar 2018 09:47:26 +1100
Subject: [PATCH] nds32: merge fix for dump_stack update

Signed-off-by: Stephen Rothwell <s...@canb.auug.org.au>
 arch/nds32/kernel/traps.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/nds32/kernel/traps.c b/arch/nds32/kernel/traps.c
index 8828b4aeb72b..455bb0787367 100644
--- a/arch/nds32/kernel/traps.c
+++ b/arch/nds32/kernel/traps.c
@@ -166,8 +166,6 @@ void dump_stack(void)
        __dump(NULL, base_reg);
 void show_stack(struct task_struct *tsk, unsigned long *sp)
        unsigned long *base_reg;

Stephen Rothwell

Attachment: pgpfDK_kldMCf.pgp
Description: OpenPGP digital signature

Reply via email to