Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-12-06--21-00 (v6.13-rc1-413-g803ecee87729) remotes/brancher/net-next-2024-12-07--00-01 (v6.13-rc1-451-gbe5e696a82a5) ==== BASE IDENTICAL ==== ==== COMMIT DIFF ==== diff --git a/tmp/tmp.xnfyRBuItZ b/tmp/tmp.Sr2klXG0Mi index e6fd81da4f82..eb05b4b6dc1e 100644 --- a/tmp/tmp.xnfyRBuItZ +++ b/tmp/tmp.Sr2klXG0Mi @@ -3,6 +3,8 @@ fs/9p: use kvzalloc/kvfree to allocate struct p9_rdir and its buffer tc_action dbg profile patch forwarding: set timeout to 3 hours +Merge tag 'bpf-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf +mctp: no longer rely on net->dev_index_head[] net: dsa: microchip: Make MDIO bus name unique net: wwan: t7xx: Replace deprecated PCI functions ice: Add correct PHY lane assignment @@ -172,3 +174,39 @@ octeontx2-pf: Move skb fragment map/unmap to common code octeontx2-pf: map skb data as device writeable net: simplify resource acquisition + ioremap ptp: kvm: x86: Return EOPNOTSUPP instead of ENODEV from kvm_arch_ptp_init() +Merge branch 'fixes-for-lpm-trie' +selftests/bpf: Add more test cases for LPM trie +selftests/bpf: Move test_lpm_map.c to map_tests +bpf: Use raw_spinlock_t for LPM trie +bpf: Switch to bpf mem allocator for LPM trie +bpf: Fix exact match conditions in trie_get_next_key() +bpf: Handle in-place update for full LPM trie correctly +bpf: Handle BPF_EXIST and BPF_NOEXIST for LPM trie +bpf: Remove unnecessary kfree(im_node) in lpm_trie_update_elem +bpf: Remove unnecessary check when updating LPM trie +Merge branch 'fixes-for-stack-with-allow_ptr_leaks' +selftests/bpf: Add test for narrow spill into 64-bit spilled scalar +selftests/bpf: Add test for reading from STACK_INVALID slots +selftests/bpf: Introduce __caps_unpriv annotation for tests +bpf: Fix narrow scalar spill onto 64-bit spilled scalar slots +bpf: Don't mark STACK_INVALID as STACK_MISC in mark_stack_slot_misc +samples/bpf: Remove unnecessary -I flags from libbpf EXTRA_CFLAGS +bpf: Zero index arg error string for dynptr and iter +Merge branch 'fix-missing-process_iter_arg-type-check' +selftests/bpf: Add tests for iter arg check +bpf: Ensure reg is PTR_TO_STACK in process_iter_arg +tools: Override makefile ARCH variable if defined, but empty +selftests/bpf: Add apply_bytes test to test_txmsg_redir_wait_sndmem in test_sockmap +tcp_bpf: Fix the sk_mem_uncharge logic in tcp_bpf_sendmsg +selftests/bpf: Check for PREEMPTION instead of PREEMPT +bpftool: fix potential NULL pointer dereferencing in prog_dump() +xsk: always clear DMA mapping information when unmapping the pool +Merge branch 'bpf-fix-oob-accesses-in-map_delete_elem-callbacks' +bpf: fix OOB devmap writes when deleting elements +xsk: fix OOB map writes when deleting elements +Merge branch 'bpf-vsock-fix-poll-and-close' +selftest/bpf: Add test for vsock removal from sockmap on close() +bpf, vsock: Invoke proto::close on close() +selftest/bpf: Add test for af_vsock poll() +bpf, vsock: Fix poll() missing a queue +bpf, lsm: Remove getlsmprop hooks BTF IDs