Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 7.2-rc5

Browse source

Cross-merge BPF and other fixes after downstream PR.

Conflicts:
	net/core/filter.c

Changes [2] in bpf-next conflict with a recent fix [1]
from the 'net' tree. Resolved by using [1] as a base and
applying same flags handling logic as in [2] in the
bpf_redirect_peer() helper.

[1] https://lore.kernel.org/all/20260706185609.330006-2-daniel@iogearbox.net/
[2] https://lore.kernel.org/all/20260618182035.43811-2-jordan@jrife.io/

Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>

...

This commit is contained in:

Eduard Zingerman 2026-07-24 21:44:01 -07:00

parent c8e55f55a4 0ce37745d4

commit 4748a67f71

572 changed files with 6385 additions and 2555 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

13

.mailmap

View file

7

CREDITS

View file

174

Documentation/ABI/testing/sysfs-kernel-mm-damon

View file

40

Documentation/netlink/specs/rt-link.yaml

View file

4

Documentation/watchdog/watchdog-parameters.rst

View file

14

MAINTAINERS

View file

2

Makefile

View file

1

arch/arc/configs/axs101_defconfig

View file

1

arch/arc/configs/axs103_defconfig

View file

1

arch/arc/configs/axs103_smp_defconfig

View file

1

arch/arc/configs/tb10x_defconfig

View file

6

arch/arc/kernel/smp.c

View file

2

arch/arm64/include/asm/esr.h

View file

6

arch/arm64/include/asm/fixmap.h

View file

6

arch/arm64/include/asm/kprobes.h

View file

45

arch/arm64/kernel/probes/kprobes.c

View file

7

arch/arm64/mm/fault.c

View file

2

arch/arm64/mm/hugetlbpage.c

View file

2

arch/arm64/mm/mmu.c

View file

2

arch/m68k/include/asm/page_mm.h

View file

2

arch/riscv/Kconfig

View file

5

arch/riscv/include/asm/cacheflush.h

View file

8

arch/riscv/include/asm/io.h

View file

10

arch/riscv/include/asm/kvm_host.h

View file

2

arch/riscv/kernel/entry.S

View file

1

arch/riscv/kernel/sys_hwprobe.c

View file

6

arch/riscv/kernel/vdso/Makefile

View file

10

arch/riscv/kernel/vdso/rt_sigreturn.S

View file

35

arch/riscv/kvm/aia.c

View file

6

arch/riscv/kvm/gstage.c

View file

3

arch/riscv/kvm/mmu.c

View file

68

arch/riscv/kvm/vcpu.c

View file

19

arch/riscv/kvm/vcpu_exit.c

View file

46

arch/riscv/kvm/vcpu_onereg.c

View file

4

arch/riscv/kvm/vcpu_pmu.c

View file

6

arch/riscv/kvm/vcpu_sbi_fwft.c

View file

14

arch/riscv/kvm/vcpu_vector.c

View file

2

arch/riscv/mm/init.c

View file

3

arch/s390/kernel/perf_cpum_cf.c

View file

1

arch/s390/kernel/time.c

View file

2

arch/s390/lib/csum-partial.c

View file

7

arch/x86/boot/compressed/acpi.c

View file

11

arch/x86/boot/early_serial_console.c

View file

1

arch/x86/kernel/cpu/Makefile

View file

2

arch/x86/kvm/lapic.c

View file

12

arch/x86/kvm/mmu/mmu.c

View file

10

arch/x86/kvm/mmu/paging_tmpl.h

View file

11

arch/x86/kvm/vmx/nested.c

View file

64

block/bio.c

View file

4

block/blk-cgroup.c

View file

9

block/blk-map.c

View file

13

block/blk.h

View file

9

block/elevator.c

View file

7

block/error-injection.c

View file

9

block/partitions/aix.c

View file

26

drivers/accel/amdxdna/aie2_ctx.c

View file

1

drivers/accel/amdxdna/aie2_pci.c

View file

7

drivers/accel/amdxdna/aie2_pci.h

View file

18

drivers/accel/amdxdna/amdxdna_ctx.c

View file

54

drivers/accel/ethosu/ethosu_gem.c

View file

4

drivers/accel/ivpu/ivpu_fw_log.c

View file

2

drivers/accel/ivpu/ivpu_hw_btrs.c

View file

38

drivers/ata/sata_dwc_460ex.c

View file

32

drivers/block/loop.c

View file

7

drivers/block/rbd.c

View file

47

drivers/block/ublk_drv.c

View file

4

drivers/bluetooth/btusb.c

View file

1

drivers/cdrom/cdrom.c

View file

9

drivers/dma-buf/udmabuf.c

View file

62

drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c

View file

10

drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c

View file

1

drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.h

View file

9

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

View file

4

drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c

View file

13

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

View file

20

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

View file

21

drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c

View file

10

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

View file

4

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c

View file

23

drivers/gpu/drm/amd/amdkfd/kfd_queue.c

View file

554

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

View file

81

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c

View file

20

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c

View file

45

drivers/gpu/drm/amd/display/dc/core/dc.c

View file

3

drivers/gpu/drm/amd/display/dc/dc.h

View file

11

drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c

View file

2

drivers/gpu/drm/amd/display/dc/link/link_detection.c

View file

6

drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c

View file

7

drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.c

View file

1

drivers/gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource.c

View file

23

drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c

View file

116

drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.h

View file

17

drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c

View file

7

drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr.c

View file

16

drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c

View file

12

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c

View file

12

drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h

View file

45

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c

View file

59

drivers/gpu/drm/drm_gpusvm.c

View file

11

drivers/gpu/drm/drm_pagemap.c

View file

Some files were not shown because too many files have changed in this diff Show more