next-20250303/tip

# Conflicts:
#	arch/riscv/include/asm/io.h
#	arch/x86/kernel/paravirt.c
#	arch/x86/mm/pgtable.c
#	drivers/gpu/drm/i915/i915_pmu.c
#	drivers/mailbox/mailbox.c
#	lib/vdso/datastore.c
#	net/core/dev.c

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

diff --cc Makefile
Simple merge

diff --cc arch/arm64/Kconfig
Simple merge

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

diff --cc arch/loongarch/kvm/vcpu.c
Simple merge

diff --cc arch/powerpc/kvm/powerpc.c
Simple merge

diff --cc arch/riscv/Kconfig
index d1eaab6b38ce99a8f9273042a8efba357fb5d3f9,0409be7686663899e58d5e9212f84f5232604622..adbf9a7f42755874c96d88543e147afb42949793
--- 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/boot/dts/sophgo/sg2042.dtsi
Simple merge

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/kvm/interrupt.c
Simple merge

diff --cc arch/s390/kvm/kvm-s390.c
Simple merge

diff --cc arch/um/kernel/um_arch.c
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/Makefile
Simple merge

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

diff --cc arch/x86/entry/vdso/vma.c
Simple merge

diff --cc arch/x86/events/intel/bts.c
Simple merge

diff --cc arch/x86/events/intel/core.c
Simple merge

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

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

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

diff --cc arch/x86/include/asm/nospec-branch.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/cpu/intel.c
Simple merge

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

diff --cc arch/x86/kvm/svm/svm.c
Simple merge

diff --cc arch/x86/kvm/vmx/vmx.c
Simple merge

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

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

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

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

diff --cc arch/x86/net/bpf_jit_comp.c
Simple merge

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

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

diff --cc drivers/block/null_blk/main.c
Simple merge

diff --cc drivers/cpufreq/intel_pstate.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/uc/intel_huc.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_pmu.c
index 69a109d02116e2296acea8fdc5667b326169c3a9,0ce87f188d116e7558ca5c3e4aad285790f829fa..e5a188ce318578d1e1018f5aad09cb1eeebb89b5
--- 1/drivers/gpu/drm/i915/i915_pmu.c
--- 2/drivers/gpu/drm/i915/i915_pmu.c
+++ b/drivers/gpu/drm/i915/i915_pmu.c
@@@ -1155,8 -1264,8 +1155,7 @@@ void i915_pmu_register(struct drm_i915_
        int ret = -ENOMEM;
  
        spin_lock_init(&pmu->lock);
-       hrtimer_init(&pmu->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-       pmu->timer.function = i915_sample;
+       hrtimer_setup(&pmu->timer, i915_sample, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
 -      pmu->cpuhp.cpu = -1;
        init_rc6(pmu);
  
        if (IS_DGFX(i915)) {

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/irqchip/Kconfig
Simple merge

diff --cc drivers/irqchip/Makefile
Simple merge

diff --cc drivers/irqchip/irq-gic-v2m.c
Simple merge

diff --cc drivers/irqchip/irq-gic-v3-its.c
Simple merge

diff --cc drivers/irqchip/irq-gic-v3-mbi.c
Simple merge

diff --cc drivers/media/cec/core/cec-pin.c
Simple merge

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

diff --cc drivers/mmc/host/dw_mmc.c
Simple merge

diff --cc drivers/net/ethernet/cortina/gemini.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/ethernet/ti/icssg/icssg_common.c
Simple merge

diff --cc drivers/net/ethernet/ti/icssg/icssg_prueth.c
Simple merge

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

diff --cc drivers/pci/Kconfig
Simple merge

diff --cc drivers/s390/crypto/ap_bus.c
index 20cb8d272e5677d40bbfccb321eda441003b59d5,62feb2c639d56af42055989ddcf0ea6666d3d622..1564cd7e3f598ac31a66e0402db1f8b53197629e
--- 1/drivers/s390/crypto/ap_bus.c
--- 2/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@@ -2325,10 -2324,9 +2325,9 @@@ static inline int __init ap_async_init(
         * Setup the high resolution poll timer.
         * If we are running under z/VM adjust polling to z/VM polling rate.
         */
 -      if (MACHINE_IS_VM)
 +      if (machine_is_vm())
                poll_high_timeout = 1500000;
-       hrtimer_init(&ap_poll_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
-       ap_poll_timer.function = ap_poll_timeout;
+       hrtimer_setup(&ap_poll_timer, ap_poll_timeout, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
  
        queue_work(system_long_wq, &ap_scan_bus_work);
  

diff --cc drivers/scsi/lpfc/lpfc_init.c
Simple merge

diff --cc drivers/usb/typec/tcpm/tcpm.c
Simple merge

diff --cc drivers/virt/coco/sev-guest/sev-guest.c
Simple merge

diff --cc fs/timerfd.c
Simple merge

diff --cc include/linux/compiler.h
index 3a7a537e13a39c5fbb8e638ba49c0d5b6a5418e4,e80d0f04d78f43da71af6d6efc510c10f590f423..8417028b689a21a2502edc3e8a5264f48a814278
--- 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/msi.h
Simple merge

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

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

diff --cc init/Kconfig
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/bpf/verifier.c
Simple merge

diff --cc kernel/cfi.c
Simple merge

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

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

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/locking/mutex.c
Simple merge

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

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sched/deadline.c
Simple merge

diff --cc kernel/sched/fair.c
Simple merge

diff --cc kernel/time/posix-clock.c
Simple merge

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

diff --cc mm/memory.c
Simple merge

diff --cc mm/percpu.c
Simple merge

diff --cc mm/slab_common.c
Simple merge

diff --cc mm/vmstat.c
Simple merge

diff --cc net/core/dev.c
index 6fa6ed5b57987f1c3e02c7fa128755cca5eed566,03a7f867c7b349cf6b0773c7033f5ef8e0c03c49..665963e477a7ffbf77607eb481e1fe1385a51ab1
--- 1/net/core/dev.c
--- 2/net/core/dev.c
+++ b/net/core/dev.c
@@@ -7153,10 -7013,11 +7153,9 @@@ void netif_napi_add_weight_locked(struc
  
        INIT_LIST_HEAD(&napi->poll_list);
        INIT_HLIST_NODE(&napi->napi_hash_node);
-       hrtimer_init(&napi->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_PINNED);
-       napi->timer.function = napi_watchdog;
+       hrtimer_setup(&napi->timer, napi_watchdog, CLOCK_MONOTONIC, HRTIMER_MODE_REL_PINNED);
 -      init_gro_hash(napi);
 +      gro_init(&napi->gro);
        napi->skb = NULL;
 -      INIT_LIST_HEAD(&napi->rx_list);
 -      napi->rx_count = 0;
        napi->poll = poll;
        if (weight > NAPI_POLL_WEIGHT)
                netdev_err_once(dev, "%s() called with weight %d\n", __func__,

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

diff --cc net/sched/sch_api.c
Simple merge

diff --cc net/xfrm/xfrm_state.c
Simple merge

diff --cc scripts/link-vmlinux.sh
Simple merge