Merge branch 'core-rseq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull restartable sequence support from Thomas Gleixner:
 "The restartable sequences syscall (finally):

  After a lot of back and forth discussion and massive delays caused by
  the speculative distraction of maintainers, the core set of
  restartable sequences has finally reached a consensus.

  It comes with the basic non disputed core implementation along with
  support for arm, powerpc and x86 and a full set of selftests

  It was exposed to linux-next earlier this week, so it does not fully
  comply with the merge window requirements, but there is really no
  point to drag it out for yet another cycle"

* 'core-rseq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  rseq/selftests: Provide Makefile, scripts, gitignore
  rseq/selftests: Provide parametrized tests
  rseq/selftests: Provide basic percpu ops test
  rseq/selftests: Provide basic test
  rseq/selftests: Provide rseq library
  selftests/lib.mk: Introduce OVERRIDE_TARGETS
  powerpc: Wire up restartable sequences system call
  powerpc: Add syscall detection for restartable sequences
  powerpc: Add support for restartable sequences
  x86: Wire up restartable sequence system call
  x86: Add support for restartable sequences
  arm: Wire up restartable sequences system call
  arm: Add syscall detection for restartable sequences
  arm: Add restartable sequences support
  rseq: Introduce restartable sequences system call
  uapi/headers: Provide types_32_64.h

diff --cc MAINTAINERS
Simple merge

diff --cc arch/Kconfig
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/kernel/entry-common.S
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/include/asm/systbl.h
Simple merge

diff --cc arch/powerpc/kernel/entry_64.S
Simple merge

diff --cc arch/powerpc/kernel/signal.c
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc fs/exec.c
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc kernel/Makefile
index 9b924136131158b489e8b9b91b28a37eabcd17d1,7085c841c413f1150ab69dc5a3453b2ba5c7b3f9..d2001624fe7a31b788508e5da97924173bf2e33e
--- 1/kernel/Makefile
--- 2/kernel/Makefile
+++ b/kernel/Makefile
@@@ -112,8 -112,8 +112,9 @@@ obj-$(CONFIG_JUMP_LABEL) += jump_label.
  obj-$(CONFIG_CONTEXT_TRACKING) += context_tracking.o
  obj-$(CONFIG_TORTURE_TEST) += torture.o
  
 -obj-$(CONFIG_HAS_IOMEM) += memremap.o
 +obj-$(CONFIG_HAS_IOMEM) += iomem.o
 +obj-$(CONFIG_ZONE_DEVICE) += memremap.o
+ obj-$(CONFIG_RSEQ) += rseq.o
  
  $(obj)/configs.o: $(obj)/config_data.h
  

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/sys_ni.c
Simple merge

diff --cc tools/testing/selftests/Makefile
index 4cd339b5366a5e17908de19455efcfedf0e50b34,593fb44c9cd419b2ba01df12b5b4ac04e6bc65cf..f1fe492c8e17d060d70009f5ff139cbf975c6f72
--- 1/tools/testing/selftests/Makefile
--- 2/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@@ -29,7 -28,7 +29,8 @@@ TARGETS += powerp
  TARGETS += proc
  TARGETS += pstore
  TARGETS += ptrace
+ TARGETS += rseq
 +TARGETS += rtc
  TARGETS += seccomp
  TARGETS += sigaltstack
  TARGETS += size

diff --cc tools/testing/selftests/lib.mk
Simple merge