aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexei Starovoitov <ast@kernel.org>2026-05-25 06:33:15 -0700
committerAlexei Starovoitov <ast@kernel.org>2026-05-25 06:33:30 -0700
commiteb19eead368bb0f0ef06a4125d03ed661cd23d36 (patch)
treec831fe5940f705d97ee4ff8a33b14fe8ef013f31
parentb1fcdf9aa9f562d0768f59ae178ed4e67fd7f370 (diff)
parente7ae89a0c97ce2b68b0983cd01eda67cf373517d (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 7.1-rc5
Cross-merge BPF and other fixes after downstream PR. Signed-off-by: Alexei Starovoitov <ast@kernel.org>
-rw-r--r--.mailmap3
-rw-r--r--Documentation/.renames.txt1
-rw-r--r--Documentation/admin-guide/laptops/uniwill-laptop.rst10
-rw-r--r--Documentation/admin-guide/pm/amd-pstate.rst11
-rw-r--r--Documentation/admin-guide/pm/intel_pstate.rst11
-rw-r--r--Documentation/arch/riscv/cmodx.rst8
-rw-r--r--Documentation/arch/riscv/zicfilp.rst2
-rw-r--r--Documentation/crypto/krb5.rst17
-rw-r--r--Documentation/devicetree/bindings/display/msm/dp-controller.yaml28
-rw-r--r--Documentation/devicetree/bindings/display/msm/qcom,eliza-mdss.yaml20
-rw-r--r--Documentation/devicetree/bindings/display/msm/qcom,sm8650-dpu.yaml2
-rw-r--r--Documentation/devicetree/bindings/display/msm/qcom,sm8650-mdss.yaml2
-rw-r--r--Documentation/devicetree/bindings/display/msm/qcom,sm8750-mdss.yaml16
-rw-r--r--Documentation/devicetree/bindings/net/eswin,eic7700-eth.yaml13
-rw-r--r--Documentation/devicetree/bindings/sound/mediatek,mt8173-rt5650-rt5514.yaml2
-rw-r--r--Documentation/devicetree/bindings/spi/fsl,spi-fsl-qspi.yaml3
-rw-r--r--Documentation/hwmon/sy7636a-hwmon.rst2
-rw-r--r--Documentation/netlink/genetlink-c.yaml9
-rw-r--r--Documentation/netlink/genetlink-legacy.yaml9
-rw-r--r--Documentation/netlink/genetlink.yaml9
-rw-r--r--Documentation/netlink/netlink-raw.yaml9
-rw-r--r--Documentation/netlink/specs/net_shaper.yaml7
-rw-r--r--Documentation/networking/device_drivers/ethernet/3com/3c509.rst249
-rw-r--r--Documentation/networking/device_drivers/ethernet/index.rst1
-rw-r--r--Documentation/process/index.rst1
-rw-r--r--Documentation/process/security-bugs.rst106
-rw-r--r--Documentation/process/threat-model.rst235
-rw-r--r--Documentation/sound/codecs/cs35l56.rst2
-rw-r--r--Documentation/virt/kvm/x86/amd-memory-encryption.rst8
-rw-r--r--MAINTAINERS46
-rw-r--r--Makefile2
-rw-r--r--arch/alpha/include/asm/Kbuild1
-rw-r--r--arch/arc/include/asm/Kbuild1
-rw-r--r--arch/arm/boot/dts/renesas/r7s72100-genmai.dts3
-rw-r--r--arch/arm/boot/dts/renesas/r7s72100-rskrza1.dts2
-rw-r--r--arch/arm/boot/dts/renesas/r7s72100.dtsi2
-rw-r--r--arch/arm/boot/dts/renesas/r8a7778.dtsi2
-rw-r--r--arch/arm/boot/dts/renesas/r8a7779.dtsi2
-rw-r--r--arch/arm/boot/dts/renesas/r8a7792.dtsi2
-rw-r--r--arch/arm/include/asm/Kbuild1
-rw-r--r--arch/arm/mach-versatile/integrator_cp.c13
-rw-r--r--arch/arm64/boot/dts/renesas/draak-ebisu-panel-aa104xd12.dtso5
-rw-r--r--arch/arm64/boot/dts/renesas/r8a78000.dtsi8
-rw-r--r--arch/arm64/boot/dts/renesas/r9a09g056.dtsi1
-rw-r--r--arch/arm64/boot/dts/renesas/r9a09g057.dtsi2
-rw-r--r--arch/arm64/boot/dts/renesas/rz-smarc-cru-csi-ov5645.dtsi5
-rw-r--r--arch/arm64/boot/dts/renesas/rz-smarc-du-adv7513.dtsi5
-rw-r--r--arch/arm64/boot/dts/renesas/salvator-panel-aa104xd12.dtso5
-rw-r--r--arch/arm64/include/asm/insn.h2
-rw-r--r--arch/arm64/include/asm/kvm_nested.h1
-rw-r--r--arch/arm64/include/asm/page.h2
-rw-r--r--arch/arm64/include/asm/ring_buffer.h10
-rw-r--r--arch/arm64/include/asm/sysreg.h2
-rw-r--r--arch/arm64/include/asm/tlb.h3
-rw-r--r--arch/arm64/kernel/entry-common.c31
-rw-r--r--arch/arm64/kvm/arm.c25
-rw-r--r--arch/arm64/kvm/hyp/include/hyp/switch.h2
-rw-r--r--arch/arm64/kvm/hyp/nvhe/clock.c3
-rw-r--r--arch/arm64/kvm/hyp/nvhe/mem_protect.c47
-rw-r--r--arch/arm64/kvm/hyp/nvhe/pkvm.c16
-rw-r--r--arch/arm64/kvm/hyp/nvhe/trace.c9
-rw-r--r--arch/arm64/kvm/hyp/vhe/switch.c3
-rw-r--r--arch/arm64/kvm/mmu.c29
-rw-r--r--arch/arm64/kvm/vgic/vgic-its.c4
-rw-r--r--arch/arm64/mm/fault.c11
-rw-r--r--arch/csky/include/asm/Kbuild1
-rw-r--r--arch/hexagon/include/asm/Kbuild1
-rw-r--r--arch/loongarch/include/asm/Kbuild1
-rw-r--r--arch/loongarch/include/asm/efi.h4
-rw-r--r--arch/loongarch/include/asm/paravirt.h6
-rw-r--r--arch/loongarch/include/asm/qspinlock.h5
-rw-r--r--arch/loongarch/kernel/kprobes.c14
-rw-r--r--arch/loongarch/kernel/relocate.c50
-rw-r--r--arch/loongarch/mm/init.c4
-rw-r--r--arch/m68k/include/asm/Kbuild1
-rw-r--r--arch/microblaze/include/asm/Kbuild1
-rw-r--r--arch/mips/include/asm/Kbuild1
-rw-r--r--arch/nios2/include/asm/Kbuild1
-rw-r--r--arch/nios2/include/asm/linkage.h2
-rw-r--r--arch/openrisc/include/asm/Kbuild1
-rw-r--r--arch/parisc/include/asm/Kbuild1
-rw-r--r--arch/powerpc/Kconfig.debug3
-rw-r--r--arch/powerpc/configs/g5_defconfig2
-rw-r--r--arch/powerpc/configs/ppc6xx_defconfig1
-rw-r--r--arch/powerpc/include/asm/Kbuild1
-rw-r--r--arch/powerpc/include/asm/pmac_low_i2c.h4
-rw-r--r--arch/powerpc/kernel/time.c6
-rw-r--r--arch/powerpc/perf/hv-gpci.c24
-rw-r--r--arch/powerpc/platforms/44x/warp.c2
-rw-r--r--arch/powerpc/platforms/82xx/km82xx.c4
-rw-r--r--arch/powerpc/platforms/powermac/low_i2c.c34
-rw-r--r--arch/riscv/Kconfig22
-rw-r--r--arch/riscv/boot/dts/microchip/mpfs-icicle-kit-fabric.dtsi10
-rw-r--r--arch/riscv/boot/dts/microchip/mpfs-icicle-kit-prod.dts10
-rw-r--r--arch/riscv/boot/dts/microchip/mpfs-icicle-kit.dts19
-rw-r--r--arch/riscv/boot/dts/starfive/jh7110-common.dtsi27
-rw-r--r--arch/riscv/boot/dts/starfive/jh7110.dtsi28
-rw-r--r--arch/riscv/errata/mips/errata.c2
-rw-r--r--arch/riscv/include/asm/Kbuild1
-rw-r--r--arch/riscv/kernel/compat_signal.c2
-rw-r--r--arch/riscv/kernel/copy-unaligned.S5
-rw-r--r--arch/riscv/kernel/cpufeature.c20
-rw-r--r--arch/riscv/kernel/ptrace.c4
-rw-r--r--arch/riscv/kernel/traps_misaligned.c2
-rw-r--r--arch/riscv/kernel/usercfi.c7
-rw-r--r--arch/riscv/kernel/vec-copy-unaligned.S5
-rw-r--r--arch/riscv/kvm/vcpu_insn.c9
-rw-r--r--arch/riscv/kvm/vcpu_pmu.c12
-rw-r--r--arch/riscv/kvm/vcpu_sbi_sta.c2
-rw-r--r--arch/riscv/kvm/vcpu_sbi_v01.c2
-rw-r--r--arch/riscv/mm/init.c25
-rw-r--r--arch/s390/include/asm/Kbuild1
-rw-r--r--arch/s390/kernel/perf_pai.c31
-rw-r--r--arch/s390/kernel/topology.c10
-rw-r--r--arch/s390/kvm/dat.c1
-rw-r--r--arch/s390/kvm/dat.h3
-rw-r--r--arch/s390/kvm/gaccess.c1
-rw-r--r--arch/s390/kvm/gmap.c18
-rw-r--r--arch/s390/kvm/gmap.h61
-rw-r--r--arch/s390/kvm/interrupt.c3
-rw-r--r--arch/s390/kvm/pci.c10
-rw-r--r--arch/sh/include/asm/Kbuild1
-rw-r--r--arch/sparc/include/asm/Kbuild1
-rw-r--r--arch/um/include/asm/Kbuild1
-rw-r--r--arch/x86/entry/Makefile2
-rw-r--r--arch/x86/entry/common.c61
-rw-r--r--arch/x86/entry/entry.S46
-rw-r--r--arch/x86/entry/entry_64_fred.S1
-rw-r--r--arch/x86/entry/vdso/vma.c2
-rw-r--r--arch/x86/include/asm/Kbuild1
-rw-r--r--arch/x86/include/asm/desc.h4
-rw-r--r--arch/x86/include/asm/desc_defs.h2
-rw-r--r--arch/x86/include/asm/entry-common.h2
-rw-r--r--arch/x86/include/asm/fred.h1
-rw-r--r--arch/x86/include/asm/msr-index.h3
-rw-r--r--arch/x86/kernel/acpi/cppc.c6