Single branch specified, using that and the previous one:
   remotes/brancher/net-next-2024-09-14--18-00 (v6.11-rc7-1586-g40541236b40c)
   remotes/brancher/net-next-2024-09-14--21-00 (v6.11-rc7-1879-gf6647b5932c4)

==== BASE IDENTICAL ====
==== COMMIT DIFF ====
diff --git a/tmp/tmp.kdBicmX1bk b/tmp/tmp.K1KX7yT4ci
index 36de3e969347..11beb2a4ea5d 100644
--- a/tmp/tmp.kdBicmX1bk
+++ b/tmp/tmp.K1KX7yT4ci
@@ -1,8 +1,8 @@
 tc_action dbg
 profile patch
-selftests/bpf: Fix a btf_dump selftest failure
 forwarding: set timeout to 3 hours
 selftests: net: improve missing modules error message
+Merge tag 'bpf-next-6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
 net/mlx5: HWS, check the correct variable in hws_send_ring_alloc_sq()
 ice: Fix a NULL vs IS_ERR() check in probe()
 ice: Fix a couple NULL vs IS_ERR() bugs
@@ -52,3 +52,296 @@ net: netconsole: remove msg_ready variable
 net: ethtool: Add support for writing firmware blocks using EPL payload
 net: ethtool: Add new parameters and a function to support EPL
 selftests: net: ioam: add tunsrc support
+btf: require pahole 1.21+ for DEBUG_INFO_BTF with default DWARF version
+btf: move pahole check in scripts/link-vmlinux.sh to lib/Kconfig.debug
+btf: remove redundant CONFIG_BPF test in scripts/link-vmlinux.sh
+Merge branch 'two-tiny-fixes-for-btf-record'
+bpf: Call the missed kfree() when there is no special field in btf
+bpf: Call the missed btf_record_free() when map creation fails
+selftests/bpf: Add a test case to write mtu result into .rodata
+selftests/bpf: Add a test case to write strtol result into .rodata
+selftests/bpf: Rename ARG_PTR_TO_LONG test description
+selftests/bpf: Fix ARG_PTR_TO_LONG {half-,}uninitialized test
+bpf: Zero former ARG_PTR_TO_{LONG,INT} args in case of error
+bpf: Improve check_raw_mode_ok test for MEM_UNINIT-tagged types
+bpf: Fix helper writes to read-only maps
+bpf: Remove truncation test in bpf_strtol and bpf_strtoul helpers
+bpf: Fix bpf_strtol and bpf_strtoul helpers for 32bit
+selftests/bpf: Add tests for sdiv/smod overflow cases
+bpf: Fix a sdiv overflow issue
+libbpf: Add bpf_object__token_fd accessor
+docs/bpf: Add missing BPF program types to docs
+docs/bpf: Add constant values for linkages
+bpf: Use fake pt_regs when doing bpf syscall tracepoint tracing
+Merge branch 'bpf-add-percpu-map-value-size-check'
+bpf/selftests: Check errno when percpu map value size exceeds
+bpf: Check percpu map value size first
+bpf: lsm: Set bpf_lsm_blob_sizes.lbs_task to 0
+selftests/bpf: Fix arena_atomics failure due to llvm change
+Merge branch 'harden-and-extend-elf-build-id-parsing-logic'
+selftests/bpf: add build ID tests
+bpf: wire up sleepable bpf_get_stack() and bpf_get_task_stack() helpers
+bpf: decouple stack_map_get_build_id_offset() from perf_callchain_entry
+lib/buildid: don't limit .note.gnu.build-id to the first page in ELF
+lib/buildid: implement sleepable build_id_parse() API
+lib/buildid: rename build_id_parse() into build_id_parse_nofault()
+lib/buildid: remove single-page limit for PHDR search
+lib/buildid: take into account e_phoff when fetching program headers
+lib/buildid: add single folio-based file reader abstraction
+lib/buildid: harden build ID parsing logic
+MAINTAINERS: record lib/buildid.c as owned by BPF subsystem
+bpftool: Fix undefined behavior in qsort(NULL, 0, ...)
+libbpf: Fix uretprobe.multi.s programs auto attachment
+libbpf: Fix some typos in comments
+MAINTAINERS: BPF ARC JIT: Update my e-mail address
+bpf: Fix error message on kfunc arg type mismatch
+bpftool: Fix typos
+bpftool: Fix undefined behavior caused by shifting into the sign bit
+libbpf: Fixed getting wrong return address on arm64 architecture
+libbpf: Workaround (another) -Wmaybe-uninitialized false positive
+bpftool: Improve btf c dump sorting stability
+Merge branch 'allow-kfuncs-in-tracepoint-and-perf-event'
+bpf/selftests: coverage for tp and perf event progs using kfuncs
+bpf: allow kfuncs within tracepoint and perf event programs
+bpf: change int cmd argument in __sys_bpf into typed enum bpf_cmd
+bpf: use type_may_be_null() helper for nullable-param check
+Merge branch 'local-vmtest-enhancement-and-rv64-enabled'
+selftests/bpf: Add description for running vmtest on RV64
+selftests/bpf: Add riscv64 configurations to local vmtest
+selftests/bpf: Add DENYLIST.riscv64
+selftests/bpf: Add config.riscv64
+selftests/bpf: Enable cross platform testing for vmtest
+selftests/bpf: Support local rootfs image for vmtest
+selftests/bpf: Limit URLS parsing logic to actual scope in vmtest
+selftests/bpf: Prefer static linking for LLVM libraries
+selftests/bpf: Rename fallback in bpf_dctcp to avoid naming conflict
+selftests/bpf: Adapt OUTPUT appending logic to lower versions of Make
+libbpf: fix some typos in libbpf
+bpftool: fix some typos in bpftool
+selftests/bpf: fix some typos in selftests
+Merge branch 'selftests-bpf-add-uprobe-multi-pid-filter-test'
+selftests/bpf: Add uprobe multi pid filter test for clone-ed processes
+selftests/bpf: Add uprobe multi pid filter test for fork-ed processes
+selftests/bpf: Add child argument to spawn_child function
+bpf: Fix uprobe multi pid filter check
+Merge branch 'fix-accessing-first-syscall-argument-on-rv64'
+libbpf: Fix accessing first syscall argument on RV64
+selftests/bpf: Enable test_bpf_syscall_macro: Syscall_arg1 on s390 and arm64
+libbpf: Access first syscall argument with CO-RE direct read on arm64
+libbpf: Access first syscall argument with CO-RE direct read on s390
+selftests/bpf: Add a selftest for x86 jit convergence issues
+bpf, x64: Fix a jit convergence issue
+selftests: bpf: Replace sizeof(arr)/sizeof(arr[0]) with ARRAY_SIZE
+Merge branch 'bpf-follow-up-on-gen_epilogue'
+bpf: Fix indentation issue in epilogue_idx
+bpf: Remove the insn_buf array stack usage from the inline_bpf_loop()
+samples/bpf: Remove sample tracex2
+selftests/bpf: Fix procmap_query()'s params mismatch and compilation warning
+bpf, arm64: Jit BPF_CALL to direct call when possible
+bpftool: Fix handling enum64 in btf dump sorting
+bpftool: Add missing blank lines in bpftool-net doc example
+selftests/bpf: Do not update vmlinux.h unnecessarily
+selftests/bpf: Specify libbpf headers required for %.bpf.o progs
+selftests/bpf: Check if distilled base inherits source endianness
+libbpf: Ensure new BTF objects inherit input endianness
+bpf: Use sockfd_put() helper
+bpf: Remove custom build rule
+selftests/bpf: Add tests for iter next method returning valid pointer
+bpf: Make the pointer returned by iter next method valid
+Merge branch 'bpf-add-gen_epilogue-to-bpf_verifier_ops'
+selftests/bpf: Test epilogue patching when the main prog has multiple BPF_EXIT
+selftests/bpf: A pro/epilogue test when the main prog jumps back to the 1st insn
+selftests/bpf: Add tailcall epilogue test
+selftests/bpf: Test gen_prologue and gen_epilogue
+selftests/bpf: attach struct_ops maps before test prog runs
+bpf: Export bpf_base_func_proto
+bpf: Add gen_epilogue to bpf_verifier_ops
+bpf: Adjust BPF_JMP that jumps to the 1st insn of the prologue
+bpf: Move insn_buf[16] to bpf_verifier_env
+bpf: Use kvmemdup to simplify the code
+docs/bpf: Fix a typo in verifier.rst
+selftests/bpf: Make sure stashed kptr in local kptr is freed recursively
+libbpf: Fix bpf_object__open_skeleton()'s mishandling of options
+selftests/bpf: Add test for zero offset or non-zero offset pointers as KF_ACQUIRE kfuncs argument
+bpf: Relax KF_ACQUIRE kfuncs strict type matching constraint
+selftests/bpf: Fix incorrect parameters in NULL pointer checking
+Merge branch 'bpf-arm64-simplify-jited-prologue-epilogue'
+bpf, arm64: Avoid blindly saving/restoring all callee-saved registers
+bpf, arm64: Get rid of fpb
+samples/bpf: tracex4: Fix failed to create kretprobe 'kmem_cache_alloc_node+0x0'
+selftests/bpf: Add tests for bpf_copy_from_user_str kfunc.
+bpf: Add bpf_copy_from_user_str kfunc
+selftests/bpf: use simply-expanded variables for libpcap flags
+Merge branch 'support-bpf_kptr_xchg-into-local-kptr'
+selftests/bpf: Test bpf_kptr_xchg stashing into local kptr
+bpf: Support bpf_kptr_xchg into local kptr
+bpf: Rename ARG_PTR_TO_KPTR -> ARG_KPTR_XCHG_DEST
+bpf: Search for kptrs in prog BTF structs
+bpf: Let callers of btf_parse_kptr() track life cycle of prog btf
+selftests/bpf: add multi-uprobe benchmarks
+selftests/bpf: make use of PROCMAP_QUERY ioctl if available
+Merge branch 'follow-up-for-__jited-test-tag'
+selftests/bpf: #define LOCAL_LABEL_LEN for jit_disasm_helpers.c
+selftests/bpf: match both retq/rethunk in verifier_tailcall_jit
+selftests/bpf: test_loader.c:get_current_arch() should not return 0
+selftests/bpf: Add testcase for updating attached freplace prog to prog_array map
+Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
+Merge branch 'support-bpf_fastcall-patterns-for-calls-to-kfuncs'
+selftests/bpf: check if bpf_fastcall is recognized for kfuncs
+selftests/bpf: by default use arch mask allowing all archs
+bpf: allow bpf_fastcall for bpf_cast_to_kern_ctx and bpf_rdonly_cast
+bpf: support bpf_fastcall patterns for kfuncs
+selftests/bpf: rename nocsr -> bpf_fastcall in selftests
+bpf: rename nocsr -> bpf_fastcall in verifier
+bpf: Fix percpu address space issues
+Merge branch 'bpf-fix-null-pointer-access-for-malformed-bpf_core_type_id_local-relos'
+selftests/bpf: test for malformed BPF_CORE_TYPE_ID_LOCAL relocation
+bpf: correctly handle malformed BPF_CORE_TYPE_ID_LOCAL relos
+bpf: Use kmemdup_array instead of kmemdup for multiple allocation
+Merge branch '__jited-test-tag-to-check-disassembly-after-jit'
+selftests/bpf: validate __xlated same way as __jited
+selftests/bpf: validate jit behaviour for tail calls
+selftests/bpf: __jited test tag to check disassembly after jit
+selftests/bpf: utility function to get program disassembly after jit
+selftests/bpf: replace __regex macro with "{{...}}" patterns
+selftests/bpf: fix to avoid __msg tag de-duplication by clang
+selftests/bpf: correctly move 'log' upon successful match
+selftests/bpf: less spam in the log for message matching
+Merge branch 'support-passing-bpf-iterator-to-kfuncs'
+selftests/bpf: test passing iterator to a kfunc
+bpf: allow passing struct bpf_iter_<type> as kfunc arguments
+bpf: extract iterator argument type and name validation logic
+Merge branch 'correct-recent-gcc-incompatible-changes'
+selftest/bpf: Adapt inline asm operand constraint for GCC support
+selftests/bpf: Disable strict aliasing for verifier_nocsr.c
+Merge branch 'bpf-enable-some-functions-in-cgroup-programs'
+bpf: Allow bpf_current_task_under_cgroup() with BPF_CGROUP_*
+bpf: Enable generic kfuncs for BPF_CGROUP_* programs
+samples/bpf: Fix compilation errors with cf-protection option
+libbpf: Workaround -Wmaybe-uninitialized false positive
+bpf: Remove __btf_name_valid() and change to btf_name_valid_identifier()
+Merge branch 'monitor network traffic for flaky test cases'
+selftests/bpf: Monitor traffic for select_reuseport.
+selftests/bpf: Monitor traffic for sockmap_listen.
+selftests/bpf: Monitor traffic for tc_redirect.
+selftests/bpf: netns_new() and netns_free() helpers.
+selftests/bpf: Add the traffic monitor option to test_progs.
+selftests/bpf: Add traffic monitor functions.
+Merge branch 'selftests/bpf: convert three other cgroup tests to test_progs'
+selftests/bpf: convert test_skb_cgroup_id_user to test_progs
+selftests/bpf: add proper section name to bpf prog and rename it
+selftests/bpf: convert test_cgroup_storage to test_progs
+selftests/bpf: convert get_current_cgroup_id_user to test_progs
+libbpf: Fix license for btf_relocate.c
+Merge branch 'add-bpf_get_dentry_xattr'
+selftests/bpf: Add tests for bpf_get_dentry_xattr
+bpf: Add kfunc bpf_get_dentry_xattr() to read xattr from dentry
+bpf: Move bpf_get_file_xattr to fs/bpf_fs_kfuncs.c
+Merge branch 'bpf-introduce-new-vfs-based-bpf-kfuncs'
+selftests/bpf: add positive tests for new VFS based BPF kfuncs
+selftests/bpf: add negative tests for new VFS based BPF kfuncs
+bpf: introduce new VFS based BPF kfuncs
+selftests/bpf: Fix a btf_dump selftest failure
+Merge branch 'selftests/bpf: convert test_dev_cgroup to test_progs'
+selftests/bpf: add wrong type test to cgroup dev
+selftests/bpf: convert test_dev_cgroup to test_progs
+selftests/bpf: do not disable /dev/null device access in cgroup dev test
+selftests/bpf: fix RELEASE=1 compilation for sock_addr.c
+xsk: Try to make xdp_umem_reg extension a bit more future-proof
+bpf: kprobe: Remove unused declaring of bpf_kprobe_override
+selftests/bpf: Fix error compiling tc_redirect.c with musl libc
+selftests/bpf: Fix using stdout, stderr as struct field names
+selftests/bpf: Fix compile if backtrace support missing in libc
+selftests/bpf: Fix redefinition errors compiling lwt_reroute.c
+selftests/bpf: Fix C++ compile error from missing _Bool type
+selftests/bpf: Fix error compiling test_lru_map.c
+selftests/bpf: Fix arg parsing in veristat, test_progs
+selftests/bpf: Use portable POSIX basename()
+tools/bpf: Fix the wrong format specifier
+selftests/bpf: Load struct_ops map in global_maps_resize test
+selftests/bpf: Integrate test_xdp_veth into test_progs
+selftests/bpf: Update xdp_redirect_map prog sections for libbpf
+libbpf: Don't take direct pointers into BTF data from st_ops
+Merge branch 'selftests-bpf-improve-libc-portability-musl-support-part-1'
+selftests/bpf: Fix errors compiling cg_storage_multi.h with musl libc
+selftests/bpf: Fix errors compiling crypto_sanity.c with musl libc
+selftests/bpf: Fix errors compiling decap_sanity.c with musl libc
+selftests/bpf: Fix errors compiling lwt_redirect.c with musl libc
+selftests/bpf: Fix compiling core_reloc.c with musl-libc
+selftests/bpf: Fix compiling tcp_rtt.c with musl-libc
+selftests/bpf: Fix compiling flow_dissector.c with musl-libc
+selftests/bpf: Fix compiling kfree_skb.c with musl-libc
+selftests/bpf: Fix compiling parse_tcp_hdr_opt.c with musl-libc
+selftests/bpf: Fix include of <sys/fcntl.h>
+selftests/bpf: Fix missing BUILD_BUG_ON() declaration
+selftests/bpf: Fix missing UINT_MAX definitions in benchmarks
+selftests/bpf: Fix missing ARRAY_SIZE() definition in bench.c
+selftests/bpf: Drop unneeded error.h includes
+selftests/bpf: Fix error compiling bpf_iter_setsockopt.c with musl libc
+selftests/bpf: Fix compile error from rlim_t in sk_storage_map.c
+selftests/bpf: Use pid_t consistently in test_progs.c
+selftests/bpf: Make %.test.d prerequisite order only
+Merge branch 'no_caller_saved_registers-attribute-for-helper-calls'
+selftests/bpf: test no_caller_saved_registers spill/fill removal
+selftests/bpf: __arch_* macro to limit test cases to specific archs
+selftests/bpf: allow checking xlated programs in verifier_* tests
+selftests/bpf: extract test_loader->expect_msgs as a data structure
+selftests/bpf: no need to track next_match_pos in struct test_loader
+selftests/bpf: print correct offset for pseudo calls in disasm_insn()
+selftests/bpf: Add reg_bounds tests for ldsx and subreg compare
+selftests/bpf: extract utility function for BPF disassembly
+bpf: Get better reg range with ldsx and 32bit compare
+bpf, x86, riscv, arm: no_caller_saved_registers for bpf_get_smp_processor_id()
+selftests/bpf: Add tests for ldsx of pkt data/data_end/data_meta accesses
+bpf: no_caller_saved_registers attribute for helper calls
+bpf: Fail verification for sign-extension of packet data/data_end/data_meta
+bpf: add a get_helper_proto() utility function
+tools/runqslower: Fix LDFLAGS and add LDLIBS support
+selftests/bpf: Fix wrong binary in Makefile log output
+Merge branch 'selftests-bpf-add-more-uprobe-multi-tests'
+selftests/bpf: Fix compilation failure when CONFIG_NET_FOU!=y
+selftests/bpf: Add uprobe multi consumers test
+selftests/bpf: Fix error linking uprobe_multi on mips
+selftests/bpf: Add uprobe fail tests for uprobe multi
+selftests/bpf: Add missing system defines for mips
+selftests/bpf: Don't include .d files on make clean
+selftests/bpf: Add a test for mmap-able map in map
+Merge branch 'use network helpers, part 10'
+selftests/bpf: Drop __start_server in network_helpers
+selftests/bpf: Drop inetaddr_len in sk_lookup
+selftests/bpf: Drop make_socket in sk_lookup
+selftests/bpf: Drop make_client in sk_lookup
+selftests/bpf: Workaround strict bpf_lsm return value check.
+Merge branch 'add-bpf-lsm-return-value-range-check-bpf-part'
+selftests/bpf: Add verifier tests for bpf lsm
+selftests/bpf: Add test for lsm tail call
+selftests/bpf: Add return value checks for failed tests
+selftests/bpf: Avoid load failure for token_lsm.c
+bpf: Fix compare error in function retval_range_within
+bpf: Prevent tail call between progs attached to different hooks
+bpf, lsm: Add check for BPF LSM return value
+bpf, lsm: Add disabled BPF LSM hook list
+Merge branch 'bpf-retire-the-unsupported_ops-usage-in-struct_ops'
+selftests/bpf: Ensure the unsupported struct_ops prog cannot be loaded
+selftests/bpf: Fix the missing tramp_1 to tramp_40 ops in cfi_stubs
+bpf: Check unsupported ops from the bpf_struct_ops's cfi_stubs
+bpftool: Add document for net attach/detach on tcx subcommand
+bpftool: Add bash-completion for tcx subcommand
+bpftool: Add net attach/detach command to tcx prog
+bpftool: Refactor xdp attach/detach type judgment
+Merge branch 'bpf-fix-tailcall-hierarchy'
+selftests/bpf: Add testcases for tailcall hierarchy fixing
+bpf, arm64: Fix tailcall hierarchy
+bpf, x64: Fix tailcall hierarchy
+Merge branch 'bpf-track-find_equal_scalars-history-on-per-instruction-level'
+selftests/bpf: Update comments find_equal_scalars->sync_linked_regs
+selftests/bpf: Tests for per-insn sync_linked_regs() precision tracking
+bpf: Remove mark_precise_scalar_ids()
+bpf: Track equal scalars history on per-instruction level
+selftests/bpf: Use auto-dependencies for test objects
+bpf: Simplify character output in seq_print_delegate_opts()
+bpf: Replace 8 seq_puts() calls by seq_putc() calls
+Merge branch 'use network helpers, part 9'
+selftests/bpf: Add connect_to_addr_str helper
+selftests/bpf: Drop must_fail from network_helper_opts
+selftests/bpf: Drop type of connect_to_fd_opts