Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git

# Conflicts:
#	arch/riscv/include/asm/io.h

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/boot/dts/rockchip/rk356x-base.dtsi
Simple merge

diff --cc arch/powerpc/Kconfig
index 3fdf7ba6c3b8cc7dd4343d9d080a26438142163f,8a2a6e403eb1e654254100cb7347477a3a82e3f7..9e117693dd9ff5c3174b259e8df4b5bd1a74e559
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -207,8 -207,10 +208,9 @@@ config PP
        select GENERIC_IRQ_SHOW
        select GENERIC_IRQ_SHOW_LEVEL
        select GENERIC_PCI_IOMAP                if PCI
 -      select GENERIC_PTDUMP
        select GENERIC_SMP_IDLE_THREAD
        select GENERIC_TIME_VSYSCALL
+       select GENERIC_VDSO_DATA_STORE
        select GENERIC_VDSO_TIME_NS
        select HAS_IOPORT                       if PCI
        select HAVE_ARCH_AUDITSYSCALL

diff --cc arch/riscv/Kconfig
index 5aef2aa4103ccb5adb121a75f3afe8260b8416d6,0409be7686663899e58d5e9212f84f5232604622..7c7bb9140df25f729eb727f1dabdff5c2ad8196e
--- 1/arch/riscv/Kconfig
--- 2/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -112,7 -111,9 +112,8 @@@ config RISC
        select GENERIC_IRQ_SHOW
        select GENERIC_IRQ_SHOW_LEVEL
        select GENERIC_LIB_DEVMEM_IS_ALLOWED
+       select GENERIC_PENDING_IRQ if SMP
        select GENERIC_PCI_IOMAP
 -      select GENERIC_PTDUMP if MMU
        select GENERIC_SCHED_CLOCK
        select GENERIC_SMP_IDLE_THREAD
        select GENERIC_TIME_VSYSCALL if MMU && 64BIT

diff --cc arch/riscv/include/asm/io.h
index 0536846db9b63ef08ea82fe76fb98ee40db0b8ea,0257f4aa7ff4509538a8a609acbf56bd690b7adc..a0e51840b9db43c8ddf86eebb2b6c00bd54fe878
--- 1/arch/riscv/include/asm/io.h
--- 2/arch/riscv/include/asm/io.h
+++ b/arch/riscv/include/asm/io.h
@@@ -136,8 -136,8 +136,8 @@@ __io_writes_outs(outs, u64, q, __io_pbr
  #include <asm-generic/io.h>
  
  #ifdef CONFIG_MMU
- #define arch_memremap_wb(addr, size)  \
+ #define arch_memremap_wb(addr, size, flags)   \
 -      ((__force void *)ioremap_prot((addr), (size), _PAGE_KERNEL))
 +      ((__force void *)ioremap_prot((addr), (size), __pgprot(_PAGE_KERNEL)))
  #endif
  
  #endif /* _ASM_RISCV_IO_H */

diff --cc arch/s390/Kconfig
index d1d7be8ff5f7ed3363e989cc9351e4f5ee23cedc,7ed6f229250cf6c26efd4ce30e23123cdb030b2c..fdec67368f823192594e9fbc98d44c0f9f1fe909
--- 1/arch/s390/Kconfig
--- 2/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -164,8 -163,10 +164,9 @@@ config S39
        select GENERIC_CPU_VULNERABILITIES
        select GENERIC_ENTRY
        select GENERIC_GETTIMEOFDAY
 -      select GENERIC_PTDUMP
        select GENERIC_SMP_IDLE_THREAD
        select GENERIC_TIME_VSYSCALL
+       select GENERIC_VDSO_DATA_STORE
        select GENERIC_VDSO_TIME_NS
        select GENERIC_IOREMAP if PCI
        select HAVE_ALIGNED_STRUCT_PAGE

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/entry/syscalls/syscall_32.tbl
Simple merge

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

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

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

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

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

diff --cc arch/x86/mm/init_64.c
Simple merge

diff --cc arch/x86/mm/ioremap.c
Simple merge

diff --cc block/blk-iocost.c
Simple merge

diff --cc drivers/base/power/runtime.c
Simple merge

diff --cc drivers/gpu/drm/i915/gvt/display.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_perf.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_request.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_uncore.c
Simple merge

diff --cc drivers/gpu/drm/vkms/vkms_crtc.c
Simple merge

diff --cc drivers/gpu/drm/xe/xe_oa.c
Simple merge

diff --cc drivers/idle/intel_idle.c
Simple merge

diff --cc drivers/media/platform/chips-media/wave5/wave5-vpu.c
Simple merge

diff --cc drivers/net/ethernet/intel/igc/igc_main.c
Simple merge

diff --cc drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/net/ethernet/ti/am65-cpsw-nuss.c
Simple merge

diff --cc drivers/net/wireless/virtual/mac80211_hwsim.c
Simple merge

diff --cc fs/timerfd.c
Simple merge

diff --cc include/linux/compiler.h
index 1fb5825007367476a3f9ad8c7e06b61225518aec,aa7f0a9f6085212d2bb7306aa6b54049b20fc94e..58543dbada9a9d0f792b9e07fac45d3ffff0b809
--- 1/include/linux/compiler.h
--- 2/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@@ -210,28 -210,18 +210,38 @@@ void ftrace_likely_update(struct ftrace
  #define __must_be_cstr(p) \
        __BUILD_BUG_ON_ZERO_MSG(__annotated(p, nonstring), "must be cstr (NUL-terminated)")
  
 +/*
 + * Use __typeof_unqual__() when available.
 + *
 + * XXX: Remove test for __CHECKER__ once
 + * sparse learns about __typeof_unqual__().
 + */
 +#if CC_HAS_TYPEOF_UNQUAL && !defined(__CHECKER__)
 +# define USE_TYPEOF_UNQUAL 1
 +#endif
 +
 +/*
 + * Define TYPEOF_UNQUAL() to use __typeof_unqual__() as typeof
 + * operator when available, to return an unqualified type of the exp.
 + */
 +#if defined(USE_TYPEOF_UNQUAL)
 +# define TYPEOF_UNQUAL(exp) __typeof_unqual__(exp)
 +#else
 +# define TYPEOF_UNQUAL(exp) __typeof__(exp)
 +#endif
 +
  #endif /* __KERNEL__ */
  
+ #if defined(CONFIG_CFI_CLANG) && !defined(__DISABLE_EXPORTS) && !defined(BUILD_VDSO)
+ /*
+  * Force a reference to the external symbol so the compiler generates
+  * __kcfi_typid.
+  */
+ #define KCFI_REFERENCE(sym) __ADDRESSABLE(sym)
+ #else
+ #define KCFI_REFERENCE(sym)
+ #endif
+ 
  /**
   * offset_to_ptr - convert a relative memory offset to an absolute pointer
   * @off:      the address of the 32-bit offset value

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

diff --cc include/linux/percpu-defs.h
Simple merge

diff --cc io_uring/io_uring.c
Simple merge

diff --cc io_uring/timeout.c
Simple merge

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

diff --cc kernel/events/uprobes.c
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/module/main.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc kernel/trace/bpf_trace.c
Simple merge

diff --cc lib/Makefile
Simple merge

diff --cc mm/percpu.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/ipv4/tcp_timer.c
Simple merge