Merge branch 'akpm-current/current'

Conflicts:
	fs/binfmt_elf.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc drivers/isdn/mISDN/core.c
Simple merge

diff --cc fs/binfmt_aout.c
Simple merge

diff --cc fs/binfmt_elf.c
index 7d863a4de5a51aed378cbb4172015789f491f7f7,61c58a4d6b01c1d4cd49e576f6729e9ba4c6b722..56ffa3936950b8af153c8d3328e86aee8fa2fea1
--- 1/fs/binfmt_elf.c
--- 2/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@@ -2154,14 -2184,14 +2174,14 @@@ static int elf_core_dump(struct coredum
                        goto end_coredump;
        }
  
 -      if (!elf_core_write_extra_phdrs(cprm->file, offset, &size, cprm->limit))
 +      if (!elf_core_write_extra_phdrs(cprm, offset))
                goto end_coredump;
  
-       /* write out the notes section */
+       /* write out the notes section */
 -      if (!write_note_info(&info, cprm->file, &foffset))
 +      if (!write_note_info(&info, cprm))
                goto end_coredump;
  
 -      if (elf_coredump_extra_notes_write(cprm->file, &foffset))
 +      if (elf_coredump_extra_notes_write(cprm))
                goto end_coredump;
  
        /* Align to page */

diff --cc fs/binfmt_elf_fdpic.c
index 85c23c4969998a619849dc4c39ccf5ec19ce747e,799791b98c826314c42ef2374222653f6bf82b4f..802274efdedb64f50eed9ee097495dd6a8bff337
--- 1/fs/binfmt_elf_fdpic.c
--- 2/fs/binfmt_elf_fdpic.c
+++ b/fs/binfmt_elf_fdpic.c
@@@ -1768,12 -1792,12 +1769,12 @@@ static int elf_fdpic_core_dump(struct c
                        goto end_coredump;
        }
  
 -      if (!elf_core_write_extra_phdrs(cprm->file, offset, &size, cprm->limit))
 +      if (!elf_core_write_extra_phdrs(cprm, offset))
                goto end_coredump;
  
-       /* write out the notes section */
+       /* write out the notes section */
        for (i = 0; i < numnote; i++)
 -              if (!writenote(notes + i, cprm->file, &foffset))
 +              if (!writenote(notes + i, cprm))
                        goto end_coredump;
  
        /* write out the thread status notes section */

diff --cc fs/ocfs2/cluster/heartbeat.c
Simple merge

diff --cc fs/ocfs2/dlm/dlmmaster.c
Simple merge

diff --cc fs/ocfs2/dlm/dlmrecovery.c
Simple merge

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

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

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

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

diff --cc init/do_mounts.c
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/smp.c
Simple merge

diff --cc kernel/watchdog.c
index 51c4f34d258ea397266e0dd1a96a16436415a38f,410d5bbe7f1fdfa5b7afa3171a0dd3dc2b108c1c..373d3e1356b264b2d848ff72fee2fc0a5976ca11
--- 1/kernel/watchdog.c
--- 2/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@@ -553,6 -607,14 +607,6 @@@ void __init lockup_detector_init(void
  {
        set_sample_period();
  
 -#ifdef CONFIG_NO_HZ_FULL
 -      if (watchdog_user_enabled) {
 -              watchdog_user_enabled = 0;
 -              pr_warning("Disabled lockup detectors by default for full dynticks\n");
 -              pr_warning("You can reactivate it with 'sysctl -w kernel.watchdog=1'\n");
 -      }
 -#endif
 -
        if (watchdog_user_enabled)
-               watchdog_enable_all_cpus();
+               watchdog_enable_all_cpus(false);
  }

diff --cc lib/Kconfig.debug
Simple merge

diff --cc mm/shmem.c
Simple merge

diff --cc mm/slub.c
Simple merge

diff --cc net/socket.c
Simple merge