Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka...

# Conflicts:
#	kernel/rcu/tiny.c

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

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

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

diff --cc include/trace/events/rcu.h
Simple merge

diff --cc kernel/rcu/tiny.c
index 8a52aca686a52e9e50b12700b526be0e08f09fab,7a34a99d4664f3fc050ec22378782fe26e8d1e95..c1ebfd51768ba4fe8a150fd9d807c8e49abfa705
--- 1/kernel/rcu/tiny.c
--- 2/kernel/rcu/tiny.c
+++ b/kernel/rcu/tiny.c
@@@ -246,31 -232,6 +232,20 @@@ bool poll_state_synchronize_rcu(unsigne
  }
  EXPORT_SYMBOL_GPL(poll_state_synchronize_rcu);
  
- #ifdef CONFIG_KASAN_GENERIC
- void kvfree_call_rcu(struct rcu_head *head, void *ptr)
- {
-       if (head)
-               kasan_record_aux_stack(ptr);
- 
-       __kvfree_call_rcu(head, ptr);
- }
- EXPORT_SYMBOL_GPL(kvfree_call_rcu);
- #endif
- 
 +#if IS_ENABLED(CONFIG_RCU_TORTURE_TEST)
 +unsigned long long rcutorture_gather_gp_seqs(void)
 +{
 +      return READ_ONCE(rcu_ctrlblk.gp_seq) & 0xffffULL;
 +}
 +EXPORT_SYMBOL_GPL(rcutorture_gather_gp_seqs);
 +
 +void rcutorture_format_gp_seqs(unsigned long long seqs, char *cp, size_t len)
 +{
 +      snprintf(cp, len, "g%04llx", seqs & 0xffffULL);
 +}
 +EXPORT_SYMBOL_GPL(rcutorture_format_gp_seqs);
 +#endif
 +
  void __init rcu_init(void)
  {
        open_softirq(RCU_SOFTIRQ, rcu_process_callbacks);

diff --cc kernel/rcu/tree.c
Simple merge

diff --cc mm/Kconfig
Simple merge

diff --cc mm/slab_common.c
Simple merge

diff --cc mm/slub.c
Simple merge