Merge branch 'master' into next

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc fs/compat.c
Simple merge

diff --cc fs/exec.c
Simple merge

diff --cc fs/inode.c
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc ipc/shm.c
Simple merge

diff --cc kernel/user.c
Simple merge

diff --cc mm/mmap.c
index 3b3ed0b,00ced3e..1abb918
--- 1/mm/mmap.c
--- 2/mm/mmap.c
+++ b/mm/mmap.c
@@@ -1053,12 -1049,8 +1050,11 @@@ unsigned long do_mmap_pgoff(struct fil
        error = security_file_mmap(file, reqprot, prot, flags, addr, 0);
        if (error)
                return error;
 +      error = ima_file_mmap(file, prot);
 +      if (error)
 +              return error;
  
-       return mmap_region(file, addr, len, flags, vm_flags, pgoff,
-                          accountable);
+       return mmap_region(file, addr, len, flags, vm_flags, pgoff);
  }
  EXPORT_SYMBOL(do_mmap_pgoff);
  

diff --cc mm/shmem.c
Simple merge

diff --cc security/smack/smack_lsm.c
Simple merge