Merge tag 'v3.10.61' into update

This is the 3.10.61 stable release

diff --cc Makefile
Simple merge

diff --cc arch/arm/kernel/traps.c
Simple merge

diff --cc arch/arm/mm/fault.c
index ce5f1130a13cae607d166c630003e4f4f1e67dd0,160da6d655467cb68ed837433b4d74fae3f33086..ca0fa6f291ecee005588d9460a0de0bbfd67ae3b
--- 1/arch/arm/mm/fault.c
--- 2/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@@ -277,12 -274,17 +275,17 @@@ do_page_fault(unsigned long addr, unsig
                local_irq_enable();
  
        /*
 -       * If we're in an interrupt or have no user
 +       * If we're in an interrupt, or have no irqs, or have no user
         * context, we must not take the fault..
         */
 -      if (in_atomic() || !mm)
 +      if (in_atomic() || irqs_disabled() || !mm)
                goto no_context;
  
+       if (user_mode(regs))
+               flags |= FAULT_FLAG_USER;
+       if (fsr & FSR_WRITE)
+               flags |= FAULT_FLAG_WRITE;
+ 
        /*
         * As per x86, we may deadlock here.  However, since the kernel only
         * validly references user space from well defined areas of the code,

diff --cc arch/arm64/mm/fault.c
Simple merge

diff --cc fs/ioprio.c
Simple merge

diff --cc fs/nfs/inode.c
Simple merge

diff --cc fs/nfs/nfs4proc.c
Simple merge

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

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

diff --cc kernel/events/core.c
Simple merge

diff --cc mm/memcontrol.c
Simple merge

diff --cc mm/memory.c
Simple merge

diff --cc mm/oom_kill.c
Simple merge