diff --git a/[refs] b/[refs]
index 44b402320957..e7e8fca3aedf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6291176bcd71a2766a19a10cbd9bab07d289e1d7
+refs/heads/master: 8e833fd2e1f0107ee7a4b6bc4de3c9f0e9b0ed41
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index 975c40620fe9..0223c41fb114 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -238,7 +238,8 @@ int generic_permission(struct inode *inode, int mask, unsigned int flags,
 
 	/*
 	 * Read/write DACs are always overridable.
-	 * Executable DACs are overridable if at least one exec bit is set.
+	 * Executable DACs are overridable for all directories and
+	 * for non-directories that have least one exec bit set.
 	 */
 	if (!(mask & MAY_EXEC) || execute_ok(inode))
 		if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))