Commit 932e9f35 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  security: fix compile error in commoncap.c
parents dbfad214 51b79bee
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <linux/securebits.h> #include <linux/securebits.h>
#include <linux/user_namespace.h> #include <linux/user_namespace.h>
#include <linux/binfmts.h> #include <linux/binfmts.h>
#include <linux/personality.h>
/* /*
* If a non-root user executes a setuid-root binary in * If a non-root user executes a setuid-root binary in
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment