Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Apr 2020 19:59:56 +0000 (12:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Apr 2020 19:59:56 +0000 (12:59 -0700)
commit87ad46e601340394cd75c1c79b19ca906f82c543
tree33fc81013077804e4bdea9465de66144ca1d025b
parent75bdc9293dfd1c1dea297bbc65b37c7f6dcb2bd6
parent63f818f46af9f8b3f17b9695501e8d08959feb60
Merge branch 'for-linus' of git://git./linux/kernel/git/ebiederm/user-namespace

Pull proc fix from Eric Biederman:
 "A brown paper bag slipped through my proc changes, and syzcaller
  caught it when the code ended up in your tree.

  I have opted to fix it the simplest cleanest way I know how, so there
  is no reasonable chance for the bug to repeat"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  proc: Use a dedicated lock in struct pid
kernel/pid.c