Merge branch 'akpm' (patches from Andrew)

Merge updates from Andrew Morton:

 - fsnotify updates

 - ocfs2 updates

 - all of MM

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (127 commits)
  console: don't prefer first registered if DT specifies stdout-path
  cred: simpler, 1D supplementary groups
  CREDITS: update Pavel's information, add GPG key, remove snail mail address
  mailmap: add Johan Hovold
  .gitattributes: set git diff driver for C source code files
  uprobes: remove function declarations from arch/{mips,s390}
  spelling.txt: "modeled" is spelt correctly
  nmi_backtrace: generate one-line reports for idle cpus
  arch/tile: adopt the new nmi_backtrace framework
  nmi_backtrace: do a local dump_stack() instead of a self-NMI
  nmi_backtrace: add more trigger_*_cpu_backtrace() methods
  min/max: remove sparse warnings when they're nested
  Documentation/filesystems/proc.txt: add more description for maps/smaps
  mm, proc: fix region lost in /proc/self/smaps
  proc: fix timerslack_ns CAP_SYS_NICE check when adjusting self
  proc: add LSM hook checks to /proc/<tid>/timerslack_ns
  proc: relax /proc/<tid>/timerslack_ns capability requirements
  meminfo: break apart a very long seq_printf with #ifdefs
  seq/proc: modify seq_put_decimal_[u]ll to take a const char *, not char
  proc: faster /proc/*/status
  ...

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/parisc/Kconfig
index 2a0339a,8a96bdc..71c4a3a
--- 1/arch/parisc/Kconfig
--- 2/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@@ -16,7 -14,7 +16,6 @@@ config PARIS
        select BUILDTIME_EXTABLE_SORT
        select HAVE_PERF_EVENTS
        select GENERIC_ATOMIC64 if !64BIT
-       select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 -      select BROKEN_RODATA
        select GENERIC_IRQ_PROBE
        select GENERIC_PCI_IOMAP
        select ARCH_HAVE_NMI_SAFE_CMPXCHG

diff --cc arch/parisc/kernel/vmlinux.lds.S
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/kernel/fadump.c
Simple merge

diff --cc arch/powerpc/kernel/vmlinux.lds.S
Simple merge

diff --cc fs/ext4/file.c
Simple merge

diff --cc fs/nfs/internal.h
Simple merge

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

diff --cc lib/Kconfig
Simple merge

diff --cc mm/shmem.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge