Merge branch 'akpm-current/current' into master

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/x86/entry/vdso/vma.c
Simple merge

diff --cc fs/eventpoll.c
Simple merge

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

diff --cc include/linux/sched.h
index 393db06901016d13bbaaf24db419af2e4e9a6fd4,7f673f44d872cd5ab642f47f9d4d2331ea01d0e9..74ce9e662cef0ccb374eeb13c53fbcf300b99d1b
--- 1/include/linux/sched.h
--- 2/include/linux/sched.h
+++ b/include/linux/sched.h
@@@ -1326,10 -1327,13 +1327,17 @@@ struct task_struct 
        struct callback_head            mce_kill_me;
  #endif
  
 +#ifdef CONFIG_KRETPROBES
 +      struct llist_head               kretprobe_instances;
 +#endif
 +
+ #ifdef CONFIG_DEBUG_AID_FOR_SYZBOT
+       unsigned long                   getblk_stamp;
+       unsigned int                    getblk_executed;
+       unsigned int                    getblk_bh_count;
+       unsigned long                   getblk_bh_state;
+ #endif
+ 
        /*
         * New fields for task_struct should be added above here, so that
         * they are included in the randomized portion of task_struct.

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/signal.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc lib/math/div64.c
index 3952a07130d8815139956789712739a41c4cecfe,dcc826c40ca158fda7b7adab848dab49a85ee984..064d68a5391a09da4da883f187075b9bc6056d8a
--- 1/lib/math/div64.c
--- 2/lib/math/div64.c
+++ b/lib/math/div64.c
@@@ -18,9 -18,10 +18,11 @@@
   * or by defining a preprocessor macro in arch/include/asm/div64.h.
   */
  
+ #include <linux/bitops.h>
  #include <linux/export.h>
- #include <linux/kernel.h>
+ #include <linux/math.h>
  #include <linux/math64.h>
++#include <linux/log2.h>
  
  /* Not needed on 64bit architectures */
  #if BITS_PER_LONG == 32