Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Apr 2020 20:30:18 +0000 (13:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Apr 2020 20:30:18 +0000 (13:30 -0700)
Pull SIGCHLD fix from Eric Biederman:
 "Christof Meerwald reported that do_notify_parent has not been
  successfully populating si_pid and si_uid for multi-threaded
  processes.

  This is the one-liner fix. Strictly speaking a one-liner plus
  comment"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  signal: Avoid corrupting si_pid and si_uid in do_notify_parent

1  2 
kernel/signal.c

diff --cc kernel/signal.c
Simple merge