Merge tag 'v3.14' into mergeing

Linux 3.14

Conflicts:
	arch/mips/include/asm/syscall.h
	arch/powerpc/Kconfig
	arch/x86/Kconfig
	init/Kconfig
	kernel/audit.c

diff --cc arch/alpha/Kconfig
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/mips/include/asm/syscall.h
index fc556d8052c9759d63e60aa85e8c7b0bd7187ee4,f35b131977e62a3ef0d81c47da6827f47d527b71..f8b2abf976dc9ed7cb4e7a6fcaa57c608555b5b8
--- 1/arch/mips/include/asm/syscall.h
--- 2/arch/mips/include/asm/syscall.h
+++ b/arch/mips/include/asm/syscall.h
@@@ -13,7 -13,8 +13,8 @@@
  #ifndef __ASM_MIPS_SYSCALL_H
  #define __ASM_MIPS_SYSCALL_H
  
 -#include <linux/audit.h>
 +#include <uapi/linux/audit.h>
+ #include <linux/compiler.h>
  #include <linux/elf-em.h>
  #include <linux/kernel.h>
  #include <linux/sched.h>

diff --cc arch/mips/kernel/ptrace.c
Simple merge

diff --cc arch/parisc/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
index 96627d67bd67ff02d316392a6cca39ffa48b32e3,957bf344c0f533e4ebf0c6248b3ba02caf3d8595..7b3b8feb06b6c0eff87963af717659b71715eab2
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -139,7 -140,7 +140,8 @@@ config PP
        select OLD_SIGACTION if PPC32
        select HAVE_DEBUG_STACKOVERFLOW
        select HAVE_IRQ_EXIT_ON_IRQ_STACK
+       select ARCH_USE_CMPXCHG_LOCKREF if PPC64
 +      select HAVE_ARCH_AUDITSYSCALL
  
  config GENERIC_CSUM
        def_bool CPU_LITTLE_ENDIAN

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/sh/Kconfig
Simple merge

diff --cc arch/sparc/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
index 56f47caf6fa085bf8f06723c127b1f4614a0f6d2,0af5250d914fd7b52d01873571dd6facb7bba8d4..2938365b3de701e40728846d1d153d4393d1ac94
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -125,7 -126,7 +126,8 @@@ config X8
        select RTC_LIB
        select HAVE_DEBUG_STACKOVERFLOW
        select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
+       select HAVE_CC_STACKPROTECTOR
 +      select HAVE_ARCH_AUDITSYSCALL
  
  config INSTRUCTION_DECODER
        def_bool y

diff --cc fs/proc/base.c
Simple merge

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

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

diff --cc init/Kconfig
Simple merge

diff --cc kernel/audit.c
Simple merge

diff --cc kernel/auditfilter.c
Simple merge

diff --cc kernel/auditsc.c
index 254ce2063d1d547189ed3c1796ad1a0c809a8729,7aef2f4b6c644963fb33c320c212eb856df8c69a..f251a5e8d17ad2285569466e442ae461fe17948e
--- 1/kernel/auditsc.c
--- 2/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@@ -1789,9 -1719,9 +1789,9 @@@ void audit_putname(struct filename *nam
        struct audit_context *context = current->audit_context;
  
        BUG_ON(!context);
-       if (!context->in_syscall) {
+       if (!name->aname || !context->in_syscall) {
  #if AUDIT_DEBUG == 2
 -              printk(KERN_ERR "%s:%d(:%d): final_putname(%p)\n",
 +              pr_err("%s:%d(:%d): final_putname(%p)\n",
                       __FILE__, __LINE__, context->serial, name);
                if (context->name_count) {
                        struct audit_names *n;

diff --cc lib/Makefile
Simple merge

diff --cc mm/util.c
index 43b44199c5e32a6d079f9ae523fade8666d37ab9,a24aa22f2473690c1e2fa95514f778c6c0c616a7..812271040b0795d2ba80dbddcb6e129449388d15
--- 1/mm/util.c
--- 2/mm/util.c
+++ b/mm/util.c
@@@ -409,58 -433,18 +433,66 @@@ int overcommit_kbytes_handler(struct ct
   */
  unsigned long vm_commit_limit(void)
  {
-       return ((totalram_pages - hugetlb_total_pages())
-               * sysctl_overcommit_ratio / 100) + total_swap_pages;
+       unsigned long allowed;
+ 
+       if (sysctl_overcommit_kbytes)
+               allowed = sysctl_overcommit_kbytes >> (PAGE_SHIFT - 10);
+       else
+               allowed = ((totalram_pages - hugetlb_total_pages())
+                          * sysctl_overcommit_ratio / 100);
+       allowed += total_swap_pages;
+ 
+       return allowed;
  }
  
 +/**
 + * get_cmdline() - copy the cmdline value to a buffer.
 + * @task:     the task whose cmdline value to copy.
 + * @buffer:   the buffer to copy to.
 + * @buflen:   the length of the buffer. Larger cmdline values are truncated
 + *            to this length.
 + * Returns the size of the cmdline field copied. Note that the copy does
 + * not guarantee an ending NULL byte.
 + */
 +int get_cmdline(struct task_struct *task, char *buffer, int buflen)
 +{
 +      int res = 0;
 +      unsigned int len;
 +      struct mm_struct *mm = get_task_mm(task);
 +      if (!mm)
 +              goto out;
 +      if (!mm->arg_end)
 +              goto out_mm;    /* Shh! No looking before we're done */
 +
 +      len = mm->arg_end - mm->arg_start;
 +
 +      if (len > buflen)
 +              len = buflen;
 +
 +      res = access_process_vm(task, mm->arg_start, buffer, len, 0);
 +
 +      /*
 +       * If the nul at the end of args has been overwritten, then
 +       * assume application is using setproctitle(3).
 +       */
 +      if (res > 0 && buffer[res-1] != '\0' && len < buflen) {
 +              len = strnlen(buffer, res);
 +              if (len < res) {
 +                      res = len;
 +              } else {
 +                      len = mm->env_end - mm->env_start;
 +                      if (len > buflen - res)
 +                              len = buflen - res;
 +                      res += access_process_vm(task, mm->env_start,
 +                                               buffer+res, len, 0);
 +                      res = strnlen(buffer, res);
 +              }
 +      }
 +out_mm:
 +      mmput(mm);
 +out:
 +      return res;
 +}
  
  /* Tracepoints definitions. */
  EXPORT_TRACEPOINT_SYMBOL(kmalloc);