From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 29 Mar 2022 00:10:07 +0000 (-0700)
Subject: Merge tag 'ucount-rlimit-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.6.17~7868
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0a815d0135f1be20c1a04d07f7573a26272ef846;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'ucount-rlimit-for-v5.18' of git://git./linux/kernel/git/ebiederm/user-namespace

Pull shm ucounts fix from Eric Biederman:
 "The introduction of a new failure mode when the code was converted to
  ucounts resulted in user_shm_lock misbehaving.

  The change simplifies the code to make the code easier to follow and
  removes the known misbehaviors"

* tag 'ucount-rlimit-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  mm/mlock: fix two bugs in user_shm_lock()
---

0a815d0135f1be20c1a04d07f7573a26272ef846