Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck...

diff --cc .mailmap
index 9f41b3906b663794ca27b77730d12cba68f05c35,32e12c26bdda69f222469c1313b82fa7e7e69c23..223c30c8a04f6757e3e2f08ae1ae2fd574cf482b
--- 1/.mailmap
--- 2/.mailmap
+++ b/.mailmap
@@@ -458,10 -443,10 +458,11 @@@ Mythri P K <mythripk@ti.com
  Nadav Amit <nadav.amit@gmail.com> <namit@vmware.com>
  Nadav Amit <nadav.amit@gmail.com> <namit@cs.technion.ac.il>
  Nadia Yvette Chambers <nyc@holomorphy.com> William Lee Irwin III <wli@holomorphy.com>
 -Naoya Horiguchi <naoya.horiguchi@nec.com> <n-horiguchi@ah.jp.nec.com>
 +Naoya Horiguchi <nao.horiguchi@gmail.com> <n-horiguchi@ah.jp.nec.com>
 +Naoya Horiguchi <nao.horiguchi@gmail.com> <naoya.horiguchi@nec.com>
  Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>
- Neeraj Upadhyay <quic_neeraju@quicinc.com> <neeraju@codeaurora.org>
+ Neeraj Upadhyay <neeraj.upadhyay@kernel.org> <quic_neeraju@quicinc.com>
+ Neeraj Upadhyay <neeraj.upadhyay@kernel.org> <neeraju@codeaurora.org>
  Neil Armstrong <neil.armstrong@linaro.org> <narmstrong@baylibre.com>
  Nguyen Anh Quynh <aquynh@gmail.com>
  Nicholas Piggin <npiggin@gmail.com> <npiggen@suse.de>

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/Kconfig
Simple merge

diff --cc arch/arc/Kconfig
Simple merge

diff --cc arch/sh/Kconfig
Simple merge

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

diff --cc kernel/bpf/trampoline.c
Simple merge

diff --cc kernel/trace/Kconfig
Simple merge

diff --cc lib/Makefile
Simple merge