Merge branch 'linus' into core/percpu

Conflicts:
	kernel/irq/handle.c

1 files changed, 1 insertions, 1 deletions

diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
index 71e2b914363e..8e42800878f4 100644
--- a/security/smack/smackfs.c
+++ b/security/smack/smackfs.c
@@ -334,7 +334,7 @@ static ssize_t smk_write_load(struct file *file, const char __user *buf,
                 break;
         case 'a':
         case 'A':
-                rule.smk_access |= MAY_READ;
+                rule.smk_access |= MAY_APPEND;
                 break;
         default:
                 goto out;