Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Apr 2018 00:58:51 +0000 (17:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Apr 2018 00:58:51 +0000 (17:58 -0700)
commit3be4aaf4e2d3eb95cce7835e8df797ae65ae5ac1
tree3238bb369bdcadc8dec4d7fd31fdf36b733aeb21
parent24cac7009cb1b211f1c793ecb6a462c03dc35818
parent1f5781725dcbb026438e77091c91a94f678c3522
Merge branch 'userns-linus' of git://git./linux/kernel/git/ebiederm/user-namespace

Pull userns bug fix from Eric Biederman:
 "Just a small fix to properly set the return code on error"

* 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  commoncap: Handle memory allocation failure.