]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit
projects / ceph-client.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9afc116 3b0c2d3)
Merge branch 'for-v5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ebieder...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Mar 2021 21:58:04 +0000 (13:58 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Mar 2021 21:58:04 +0000 (13:58 -0800)
commitb6b8aa27a3c64a958c8cc57ce3d37d3fbddfa3d6
tree7068c3fd99bb1c7caf40a62b299647a2b48fb735tree | snapshot
parent9afc1163794707a304f107bf21b8b37e5c6c34f4commit | diff
parent3b0c2d3eaa83da259d7726192cf55a137769012fcommit | diff
Merge branch 'for-v5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

Pull userns fix from Eric Biederman:
 "Removing the ambiguity broke userspace so this reverts the change"

* 'for-v5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  Revert 95ebabde382c ("capabilities: Don't allow writing ambiguous v3 file capabilities")
Unnamed repository; edit this file 'description' to name the repository.