Merge remote-tracking branch 'apparmor/apparmor-next'

diff --cc security/apparmor/apparmorfs.c
Simple merge

diff --cc security/apparmor/include/file.h
Simple merge

diff --cc security/apparmor/include/label.h
Simple merge

diff --cc security/apparmor/label.c
Simple merge

diff --cc security/apparmor/lsm.c
index f72406fe1bf273e8f0cec947b969e44f776333e1,64d6020ffd509efdca5d67cf53b022bd529eb9d0..0834ba6a8a2e7d8ec7419e138b0a7deff1af360c
--- 1/security/apparmor/lsm.c
--- 2/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@@ -1711,9 -1701,9 +1711,9 @@@ static int __init alloc_buffers(void
  
  #ifdef CONFIG_SYSCTL
  static int apparmor_dointvec(struct ctl_table *table, int write,
 -                           void __user *buffer, size_t *lenp, loff_t *ppos)
 +                           void *buffer, size_t *lenp, loff_t *ppos)
  {
-       if (!policy_admin_capable(NULL))
+       if (!aa_current_policy_admin_capable(NULL))
                return -EPERM;
        if (!apparmor_enabled)
                return -EINVAL;

diff --cc security/apparmor/policy.c
Simple merge

diff --cc security/apparmor/policy_unpack.c
Simple merge