Merge remote-tracking branch 'security/next'

Conflicts:
	fs/ocfs2/xattr.c

diff --cc Documentation/kernel-parameters.txt
index 0c412ff3986238d6d0af4d85f302d15cdd2685b6,cd7c861101472aa662dd08c9f89b7c82d23b0cd9..e54ec2d14aac86a97eab554e61262ad91a9cc3ce
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -49,8 -48,8 +49,9 @@@ parameter is applicable
        EDD     BIOS Enhanced Disk Drive Services (EDD) is enabled
        EFI     EFI Partitioning (GPT) is enabled
        EIDE    EIDE/ATAPI support is enabled.
+       EVM     Extended Verification Module
        FB      The frame buffer device is enabled.
 +      FTRACE  Function tracing enabled.
        GCOV    GCOV profiling is enabled.
        HW      Appropriate hardware is enabled.
        IA-64   IA-64 architecture is enabled.

diff --cc MAINTAINERS
Simple merge

diff --cc fs/gfs2/inode.c
Simple merge

diff --cc fs/xfs/xfs_iops.c
Simple merge

diff --cc kernel/cred.c
Simple merge