Merge branch 'akpm-current/current'

diff --cc MAINTAINERS
Simple merge

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

diff --cc arch/arm64/kernel/process.c
Simple merge

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

diff --cc arch/mips/cavium-octeon/setup.c
Simple merge

diff --cc arch/x86/include/asm/smp.h
Simple merge

diff --cc arch/x86/kernel/e820.c
Simple merge

diff --cc arch/x86/kernel/process.c
index c1fa790c81cd51a0cb5f5b1650a749c3b86300ee,857a686eba5eed5b2d6981be60791288733d66da..5308fb39e3040dae0075e96c5bf78428806fa55c
--- 1/arch/x86/kernel/process.c
--- 2/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@@ -509,21 -508,9 +509,20 @@@ unsigned long arch_align_stack(unsigne
  
  unsigned long arch_randomize_brk(struct mm_struct *mm)
  {
-       unsigned long range_end = mm->brk + 0x02000000;
-       return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
+       return randomize_page(mm->brk, 0x02000000);
  }
  
 +/*
 + * Return saved PC of a blocked thread.
 + * What is this good for? it will be always the scheduler or ret_from_fork.
 + */
 +unsigned long thread_saved_pc(struct task_struct *tsk)
 +{
 +      struct inactive_task_frame *frame =
 +              (struct inactive_task_frame *) READ_ONCE(tsk->thread.sp);
 +      return READ_ONCE_NOCHECK(frame->ret_addr);
 +}
 +
  /*
   * Called from fs/proc with a reference on @p to find the function
   * which called into schedule(). This needs to be done carefully

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

diff --cc drivers/char/random.c
Simple merge

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

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

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

diff --cc include/asm-generic/vmlinux.lds.h
Simple merge

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

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

diff --cc include/linux/relay.h
index ecbb34a382b898cabf40d04237fbfae5534c5bc0,61355f1cc1bf4ff294941229ca6895fc5e4045ef..ab0c59e947104e053996fb4141306f79744e92b6
--- 1/include/linux/relay.h
--- 2/include/linux/relay.h
+++ b/include/linux/relay.h
@@@ -19,7 -19,7 +19,8 @@@
  #include <linux/fs.h>
  #include <linux/poll.h>
  #include <linux/kref.h>
 +#include <linux/percpu.h>
+ #include <linux/irq_work.h>
  
  /*
   * Tracks changes to rchan/rchan_buf structs

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

diff --cc init/main.c
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/relay.c
Simple merge

diff --cc mm/huge_memory.c
Simple merge

diff --cc mm/page-writeback.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc mm/slab.c
Simple merge