diff options
| author | Eduard Zingerman <eddyz87@gmail.com> | 2026-07-24 21:44:01 -0700 |
|---|---|---|
| committer | Eduard Zingerman <eddyz87@gmail.com> | 2026-07-24 21:54:42 -0700 |
| commit | 4748a67f711188cbd64bc72c3df636f627858ed0 (patch) | |
| tree | 9c9b08a2766a5e649482bdda1a7bee6d45675b9f /tools/perf/scripts/python | |
| parent | c8e55f55a44f15d9be306b9137cef6a9f3391bf1 (diff) | |
| parent | 0ce37745d4bfbc493f718169c3974898ffec8ee7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 7.2-rc5
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>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions