Merge remote-tracking branch 'security/next'

diff --cc Documentation/kernel-parameters.txt
index 854ed5ca7e3f122f5ac808b462eb14b9ee6b1977,cd7c861101472aa662dd08c9f89b7c82d23b0cd9..cc30e72b5c078b2e0b2525ef164015d0c19b370d
--- 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