Merge branch 'stable-4.11' of git://git.infradead.org/users/pcmoore/selinux into...

diff --cc include/linux/lsm_hooks.h
Simple merge

diff --cc security/apparmor/lsm.c
index b63d39ca6278193ce9f27742c82c3d5702e2c92a,8202e5583479d0a2a1791f641aa9ca56f02d5207..709eacd23909acfa5438e9173085d91eb1780991
--- 1/security/apparmor/lsm.c
--- 2/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@@ -505,9 -495,11 +505,9 @@@ static int apparmor_getprocattr(struct 
        return error;
  }
  
- static int apparmor_setprocattr(struct task_struct *task, char *name,
-                               void *value, size_t size)
+ static int apparmor_setprocattr(const char *name, void *value,
+                               size_t size)
  {
 -      struct common_audit_data sa;
 -      struct apparmor_audit_data aad = {0,};
        char *command, *largs = NULL, *args = value;
        size_t arg_size;
        int error;

diff --cc security/security.c
Simple merge

diff --cc security/selinux/hooks.c
Simple merge

diff --cc security/smack/smack_lsm.c
Simple merge