Merge tag 'fixes-v5.10a' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Dec 2020 00:01:47 +0000 (16:01 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Dec 2020 00:01:47 +0000 (16:01 -0800)
commit197c61cb176a40f5877c3caf8249722e77b7d989
tree4cb31709e4f1614ac89dcb71c3ba8da223449b34
parent6840a3dcc2447188e7bb8464b31a7620bc4423ee
parented9b25d1970a4787ac6a39c2091e63b127ecbfc1
Merge tag 'fixes-v5.10a' of git://git./linux/kernel/git/jmorris/linux-security

Pull namespaced fscaps fix from James Morris:
 "Fix namespaced fscaps when !CONFIG_SECURITY (Serge Hallyn)"

* tag 'fixes-v5.10a' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  [SECURITY] fix namespaced fscaps when !CONFIG_SECURITY
include/linux/security.h