Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after rc4

Cross-merge bpf and other fixes after downstream PRs. No conflicts. Signed-off-by: Alexei Starovoitov <ast@kernel.org>
2026-10-20 19:23:40 +00:00 · 2025-04-28 08:40:45 -07:00 · 2025-04-28 08:40:45 -07:00 · 224ee86639
commit 224ee86639
parent 91dbac4076 b4432656b3
288 changed files with 3369 additions and 2043 deletions
--- a/Documentation/admin-guide/xfs.rst
+++ b/Documentation/admin-guide/xfs.rst
--- a/Documentation/arch/openrisc/openrisc_port.rst
+++ b/Documentation/arch/openrisc/openrisc_port.rst
--- a/Documentation/bpf/bpf_devel_QA.rst
+++ b/Documentation/bpf/bpf_devel_QA.rst
--- a/Documentation/devicetree/bindings/nvmem/layouts/fixed-cell.yaml
+++ b/Documentation/devicetree/bindings/nvmem/layouts/fixed-cell.yaml
--- a/Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml
+++ b/Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml
--- a/Documentation/devicetree/bindings/nvmem/rockchip,otp.yaml
+++ b/Documentation/devicetree/bindings/nvmem/rockchip,otp.yaml
--- a/Documentation/translations/zh_CN/arch/openrisc/openrisc_port.rst
+++ b/Documentation/translations/zh_CN/arch/openrisc/openrisc_port.rst
--- a/Documentation/translations/zh_TW/arch/openrisc/openrisc_port.rst
+++ b/Documentation/translations/zh_TW/arch/openrisc/openrisc_port.rst
--- a/46
+++ b/46
--- a/6
+++ b/6
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
--- a/arch/arm64/include/asm/mmu.h
+++ b/arch/arm64/include/asm/mmu.h
--- a/arch/arm64/kernel/cpu_errata.c
+++ b/arch/arm64/kernel/cpu_errata.c
--- a/arch/arm64/kernel/image-vars.h
+++ b/arch/arm64/kernel/image-vars.h
--- a/arch/arm64/kernel/pi/map_kernel.c
+++ b/arch/arm64/kernel/pi/map_kernel.c
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
--- a/arch/loongarch/Kconfig
+++ b/arch/loongarch/Kconfig
--- a/arch/loongarch/include/asm/fpu.h
+++ b/arch/loongarch/include/asm/fpu.h
--- a/arch/loongarch/include/asm/lbt.h
+++ b/arch/loongarch/include/asm/lbt.h
--- a/arch/loongarch/include/asm/ptrace.h
+++ b/arch/loongarch/include/asm/ptrace.h
--- a/arch/loongarch/kernel/Makefile
+++ b/arch/loongarch/kernel/Makefile
--- a/arch/loongarch/kernel/fpu.S
+++ b/arch/loongarch/kernel/fpu.S
--- a/arch/loongarch/kernel/lbt.S
+++ b/arch/loongarch/kernel/lbt.S
--- a/arch/loongarch/kernel/signal.c
+++ b/arch/loongarch/kernel/signal.c
--- a/arch/loongarch/kernel/traps.c
+++ b/arch/loongarch/kernel/traps.c
--- a/arch/loongarch/kvm/Makefile
+++ b/arch/loongarch/kvm/Makefile
--- a/arch/loongarch/kvm/intc/ipi.c
+++ b/arch/loongarch/kvm/intc/ipi.c
--- a/arch/loongarch/kvm/main.c
+++ b/arch/loongarch/kvm/main.c
--- a/arch/loongarch/kvm/vcpu.c
+++ b/arch/loongarch/kvm/vcpu.c
--- a/arch/loongarch/mm/hugetlbpage.c
+++ b/arch/loongarch/mm/hugetlbpage.c
--- a/arch/loongarch/mm/init.c
+++ b/arch/loongarch/mm/init.c
--- a/arch/openrisc/include/asm/cacheflush.h
+++ b/arch/openrisc/include/asm/cacheflush.h
--- a/arch/openrisc/include/asm/cpuinfo.h
+++ b/arch/openrisc/include/asm/cpuinfo.h
--- a/arch/openrisc/kernel/Makefile
+++ b/arch/openrisc/kernel/Makefile
--- a/arch/openrisc/kernel/cacheinfo.c
+++ b/arch/openrisc/kernel/cacheinfo.c
--- a/arch/openrisc/kernel/dma.c
+++ b/arch/openrisc/kernel/dma.c
--- a/arch/openrisc/kernel/setup.c
+++ b/arch/openrisc/kernel/setup.c
--- a/arch/openrisc/mm/cache.c
+++ b/arch/openrisc/mm/cache.c
--- a/arch/openrisc/mm/init.c
+++ b/arch/openrisc/mm/init.c
--- a/arch/riscv/include/asm/cacheflush.h
+++ b/arch/riscv/include/asm/cacheflush.h
--- a/arch/riscv/kernel/Makefile
+++ b/arch/riscv/kernel/Makefile
--- a/arch/riscv/kernel/probes/uprobes.c
+++ b/arch/riscv/kernel/probes/uprobes.c
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
--- a/arch/x86/include/asm/pgalloc.h
+++ b/arch/x86/include/asm/pgalloc.h
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
--- a/arch/x86/kernel/machine_kexec_32.c
+++ b/arch/x86/kernel/machine_kexec_32.c
--- a/arch/x86/kvm/svm/avic.c
+++ b/arch/x86/kvm/svm/avic.c
--- a/arch/x86/kvm/trace.h
+++ b/arch/x86/kvm/trace.h
--- a/arch/x86/kvm/vmx/posted_intr.c
+++ b/arch/x86/kvm/vmx/posted_intr.c
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
--- a/arch/x86/lib/x86-opcode-map.txt
+++ b/arch/x86/lib/x86-opcode-map.txt
--- a/arch/x86/mm/pgtable.c
+++ b/arch/x86/mm/pgtable.c
--- a/arch/x86/platform/efi/efi_64.c
+++ b/arch/x86/platform/efi/efi_64.c
--- a/block/bdev.c
+++ b/block/bdev.c
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
--- a/block/blk.h
+++ b/block/blk.h
--- a/block/fops.c
+++ b/block/fops.c
--- a/block/ioctl.c
+++ b/block/ioctl.c
--- a/crypto/scompress.c
+++ b/crypto/scompress.c
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
--- a/drivers/base/auxiliary.c
+++ b/drivers/base/auxiliary.c
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
--- a/drivers/base/devtmpfs.c
+++ b/drivers/base/devtmpfs.c
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
--- a/drivers/base/swnode.c
+++ b/drivers/base/swnode.c
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
--- a/drivers/comedi/drivers/jr3_pci.c
+++ b/drivers/comedi/drivers/jr3_pci.c
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
--- a/drivers/cpufreq/apple-soc-cpufreq.c
+++ b/drivers/cpufreq/apple-soc-cpufreq.c
--- a/drivers/cpufreq/cppc_cpufreq.c
+++ b/drivers/cpufreq/cppc_cpufreq.c
--- a/drivers/cpufreq/cpufreq-dt-platdev.c
+++ b/drivers/cpufreq/cpufreq-dt-platdev.c
--- a/drivers/cpufreq/scmi-cpufreq.c
+++ b/drivers/cpufreq/scmi-cpufreq.c
--- a/drivers/cpufreq/scpi-cpufreq.c
+++ b/drivers/cpufreq/scpi-cpufreq.c
--- a/drivers/cpufreq/sun50i-cpufreq-nvmem.c
+++ b/drivers/cpufreq/sun50i-cpufreq-nvmem.c
--- a/drivers/crypto/atmel-sha204a.c
+++ b/drivers/crypto/atmel-sha204a.c
--- a/drivers/cxl/core/core.h
+++ b/drivers/cxl/core/core.h
--- a/drivers/cxl/core/features.c
+++ b/drivers/cxl/core/features.c
--- a/drivers/cxl/core/pci.c
+++ b/drivers/cxl/core/pci.c
--- a/drivers/cxl/core/port.c
+++ b/drivers/cxl/core/port.c
--- a/drivers/cxl/core/regs.c
+++ b/drivers/cxl/core/regs.c
--- a/drivers/cxl/cxl.h
+++ b/drivers/cxl/cxl.h
--- a/drivers/cxl/pci.c
+++ b/drivers/cxl/pci.c
--- a/drivers/cxl/pmem.c
+++ b/drivers/cxl/pmem.c
--- a/drivers/firmware/stratix10-svc.c
+++ b/drivers/firmware/stratix10-svc.c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
--- a/drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c
--- a/drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training_8b_10b.c
+++ b/drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training_8b_10b.c
--- a/Show more
+++ b/Show more