Skip to contentSkip to conversation

core/urgent fix

GIT PULL Merged Ingo Molnar 2 participants 2 messages Jun 2, 2019

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest core-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-urgent-for-linus

# HEAD: 7eaf51a2e094229b75cc0c315f1cbbe2f3960058 stacktrace: Unbreak stack_trace_save_tsk_reliable()

Fix a stack_trace_save_tsk_reliable() regression.

Thanks,

Ingo

------------------>
Joe Lawrence (1):
stacktrace: Unbreak stack_trace_save_tsk_reliable()

 kernel/stacktrace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/stacktrace.c +1 -1
index 27bafc1e271e..90d3e0bf0302 100644
@@ -206,7 +206,7 @@ int stack_trace_save_tsk_reliable(struct task_struct *tsk, unsigned long *store,
 
 	ret = arch_stack_walk_reliable(consume_entry, &c, tsk);
 	put_task_stack(tsk);
-	return ret;
+	return ret ? ret : c.len;
 }
 #endif
 
merge bot Merged
#1 lore raw
The pull request you sent on Sun, 2 Jun 2019 19:32:34 +0200:

The pull request you sent on Sun, 2 Jun 2019 19:32:34 +0200:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-urgent-for-linus

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/4fb5741c7c5defd88046f570694fc3249479f36f

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker