From: Linus Torvalds Date: Fri, 12 Mar 2021 21:58:04 +0000 (-0800) Subject: Merge branch 'for-v5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ebieder... X-Git-Tag: howlett/maple/20220722_2~3573 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b6b8aa27a3c64a958c8cc57ce3d37d3fbddfa3d6;p=users%2Fjedix%2Flinux-maple.git 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") --- b6b8aa27a3c64a958c8cc57ce3d37d3fbddfa3d6