From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 25 Aug 2021 16:56:10 +0000 (-0700)
Subject: Merge branch 'for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=62add98208f37ce02c0425f3858757472e3fcc2e;p=linux.git

Merge branch 'for-v5.14' of git://git./linux/kernel/git/ebiederm/user-namespace

Pull ucount fixes from Eric Biederman:
 "This branch fixes a regression that made it impossible to increase
  rlimits that had been converted to the ucount infrastructure, and also
  fixes a reference counting bug where the reference was not incremented
  soon enough.

  The fixes are trivial and the bugs have been encountered in the wild,
  and the fixes have been tested"

* 'for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  ucounts: Increase ucounts reference counter before the security hook
  ucounts: Fix regression preventing increasing of rlimits in init_user_ns
---

62add98208f37ce02c0425f3858757472e3fcc2e