projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f41030a 56f2e3b)
Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Jun 2020 00:36:24 +0000 (17:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Jun 2020 00:36:24 +0000 (17:36 -0700)
Pull lockdown update from James Morris:
 "An update for the security subsystem to allow unprivileged users
  to see the status of the lockdown feature. From Jeremy Cline"

Also an added comment to describe CAP_SETFCAP.

* 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  capabilities: add description for CAP_SETFCAP
  lockdown: Allow unprivileged users to see lockdown status

1  2 
include/uapi/linux/capability.h patch | diff1 | diff2 | blob | history
security/lockdown/lockdown.c patch | diff1 | diff2 | blob | history

diff --cc include/uapi/linux/capability.h
Simple merge
diff --cc security/lockdown/lockdown.c
Simple merge
Domain: System / Kernel;