Merge tag 'v5.5-rc4' into locking/kcsan, to resolve conflicts

Conflicts:
	init/main.c
	lib/Kconfig.debug

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc Documentation/dev-tools/index.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/boot/Makefile
Simple merge

diff --cc arch/x86/boot/compressed/Makefile
Simple merge

diff --cc arch/x86/entry/vdso/Makefile
Simple merge

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

diff --cc arch/x86/kernel/Makefile
Simple merge

diff --cc arch/x86/mm/Makefile
Simple merge

diff --cc drivers/firmware/efi/libstub/Makefile
Simple merge

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

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

diff --cc init/main.c
index 4d814de,1ecfd43..919f65f
--- 1/init/main.c
--- 2/init/main.c
+++ b/init/main.c
@@@ -93,7 -93,7 +93,8 @@@
  #include <linux/rodata_test.h>
  #include <linux/jump_label.h>
  #include <linux/mem_encrypt.h>
+ #include <linux/file.h>
 +#include <linux/kcsan.h>
  
  #include <asm/io.h>
  #include <asm/bugs.h>

diff --cc kernel/Makefile
index cc53f7c,f2cc0d1..e5ffd8c
--- 1/kernel/Makefile
--- 2/kernel/Makefile
+++ b/kernel/Makefile
@@@ -120,9 -115,10 +120,11 @@@ obj-$(CONFIG_TORTURE_TEST) += torture.
  obj-$(CONFIG_HAS_IOMEM) += iomem.o
  obj-$(CONFIG_RSEQ) += rseq.o
  
+ obj-$(CONFIG_SYSCTL_KUNIT_TEST) += sysctl-test.o
+ 
  obj-$(CONFIG_GCC_PLUGIN_STACKLEAK) += stackleak.o
  KASAN_SANITIZE_stackleak.o := n
 +KCSAN_SANITIZE_stackleak.o := n
  KCOV_INSTRUMENT_stackleak.o := n
  
  $(obj)/configs.o: $(obj)/config_data.gz

diff --cc lib/Kconfig.debug
index 35accd1,5ffe144..8be73bc
--- 1/lib/Kconfig.debug
--- 2/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -1460,6 -1437,103 +1437,105 @@@ config CPU_HOTPLUG_STATE_CONTRO
  
          Say N if your are unsure.
  
+ config LATENCYTOP
+       bool "Latency measuring infrastructure"
+       depends on DEBUG_KERNEL
+       depends on STACKTRACE_SUPPORT
+       depends on PROC_FS
+       select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM && !ARC && !X86
+       select KALLSYMS
+       select KALLSYMS_ALL
+       select STACKTRACE
+       select SCHEDSTATS
+       select SCHED_DEBUG
+       help
+         Enable this option if you want to use the LatencyTOP tool
+         to find out which userspace is blocking on what kernel operations.
+ 
+ source "kernel/trace/Kconfig"
+ 
+ config PROVIDE_OHCI1394_DMA_INIT
+       bool "Remote debugging over FireWire early on boot"
+       depends on PCI && X86
+       help
+         If you want to debug problems which hang or crash the kernel early
+         on boot and the crashing machine has a FireWire port, you can use
+         this feature to remotely access the memory of the crashed machine
+         over FireWire. This employs remote DMA as part of the OHCI1394
+         specification which is now the standard for FireWire controllers.
+ 
+         With remote DMA, you can monitor the printk buffer remotely using
+         firescope and access all memory below 4GB using fireproxy from gdb.
+         Even controlling a kernel debugger is possible using remote DMA.
+ 
+         Usage:
+ 
+         If ohci1394_dma=early is used as boot parameter, it will initialize
+         all OHCI1394 controllers which are found in the PCI config space.
+ 
+         As all changes to the FireWire bus such as enabling and disabling
+         devices cause a bus reset and thereby disable remote DMA for all
+         devices, be sure to have the cable plugged and FireWire enabled on
+         the debugging host before booting the debug target for debugging.
+ 
+         This code (~1k) is freed after boot. By then, the firewire stack
+         in charge of the OHCI-1394 controllers should be used instead.
+ 
+         See Documentation/debugging-via-ohci1394.txt for more information.
+ 
+ source "samples/Kconfig"
+ 
++source "lib/Kconfig.kcsan"
++
+ config ARCH_HAS_DEVMEM_IS_ALLOWED
+       bool
+ 
+ config STRICT_DEVMEM
+       bool "Filter access to /dev/mem"
+       depends on MMU && DEVMEM
+       depends on ARCH_HAS_DEVMEM_IS_ALLOWED
+       default y if PPC || X86 || ARM64
+       help
+         If this option is disabled, you allow userspace (root) access to all
+         of memory, including kernel and userspace memory. Accidental
+         access to this is obviously disastrous, but specific access can
+         be used by people debugging the kernel. Note that with PAT support
+         enabled, even in this case there are restrictions on /dev/mem
+         use due to the cache aliasing requirements.
+ 
+         If this option is switched on, and IO_STRICT_DEVMEM=n, the /dev/mem
+         file only allows userspace access to PCI space and the BIOS code and
+         data regions.  This is sufficient for dosemu and X and all common
+         users of /dev/mem.
+ 
+         If in doubt, say Y.
+ 
+ config IO_STRICT_DEVMEM
+       bool "Filter I/O access to /dev/mem"
+       depends on STRICT_DEVMEM
+       help
+         If this option is disabled, you allow userspace (root) access to all
+         io-memory regardless of whether a driver is actively using that
+         range.  Accidental access to this is obviously disastrous, but
+         specific access can be used by people debugging kernel drivers.
+ 
+         If this option is switched on, the /dev/mem file only allows
+         userspace access to *idle* io-memory ranges (see /proc/iomem) This
+         may break traditional users of /dev/mem (dosemu, legacy X, etc...)
+         if the driver using a given range cannot be disabled.
+ 
+         If in doubt, say Y.
+ 
+ menu "$(SRCARCH) Debugging"
+ 
+ source "arch/$(SRCARCH)/Kconfig.debug"
+ 
+ endmenu
+ 
+ menu "Kernel Testing and Coverage"
+ 
+ source "lib/kunit/Kconfig"
+ 
  config NOTIFIER_ERROR_INJECTION
        tristate "Notifier error injection"
        depends on DEBUG_KERNEL

diff --cc lib/Makefile
index 778ab70,93217d4..135c6e4
--- 1/lib/Makefile
--- 2/lib/Makefile
+++ b/lib/Makefile
@@@ -24,13 -24,9 +24,12 @@@ KASAN_SANITIZE_string.o := 
  CFLAGS_string.o := $(call cc-option, -fno-stack-protector)
  endif
  
 +# Used by KCSAN while enabled, avoid recursion.
 +KCSAN_SANITIZE_random32.o := n
 +
  lib-y := ctype.o string.o vsprintf.o cmdline.o \
         rbtree.o radix-tree.o timerqueue.o xarray.o \
-        idr.o extable.o \
-        sha1.o chacha.o irq_regs.o argv_split.o \
+        idr.o extable.o sha1.o irq_regs.o argv_split.o \
         flex_proportions.o ratelimit.o show_mem.o \
         is_single_threaded.o plist.o decompress.o kobject_uevent.o \
         earlycpio.o seq_buf.o siphash.o dec_and_lock.o \

diff --cc mm/Makefile
Simple merge

diff --cc scripts/Makefile.lib
Simple merge

diff --cc tools/objtool/check.c
Simple merge