]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'ucount-rlimit-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Mar 2022 00:10:07 +0000 (17:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Mar 2022 00:10:07 +0000 (17:10 -0700)
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()

1  2 
mm/mlock.c

diff --cc mm/mlock.c
Simple merge