Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-11-14--21-00 (v6.12-rc6-2031-g30268da3f6d5) remotes/brancher/net-next-2024-11-15--00-00 (v6.12-rc6-2044-g502e5c13c2f4) ==== BASE IDENTICAL ==== ==== COMMIT DIFF ==== diff --git a/tmp/tmp.9RDpVhoYVJ b/tmp/tmp.Rgwh4NWDqJ index 034f497cbd90..da8ade25a7a2 100644 --- a/tmp/tmp.9RDpVhoYVJ +++ b/tmp/tmp.Rgwh4NWDqJ @@ -3,6 +3,9 @@ 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 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next +ixgbe: Correct BASE-BX10 compliance code +netdev-genl: Hold rcu_read_lock in napi_set netdev-genl: Hold rcu_read_lock in napi_get net: phylink: improve phylink_sfp_config_phy() error message with empty supported netfilter: nf_dup4: Convert nf_dup_ipv4_route() to dscp_t. @@ -175,3 +178,13 @@ bpf: ipv4: Prepare __bpf_redirect_neigh_v4() to future .flowi4_tos conversion. r8169: copy vendor driver 2.5G/5G EEE advertisement constraints net: phy: add phy_set_eee_broken net: phy: convert eee_broken_modes to a linkmode bitmap +Merge branch 'Fixes to bpf_msg_push/pop_data and test_sockmap' +bpf, sockmap: Fix sk_msg_reset_curr +bpf, sockmap: Several fixes to bpf_msg_pop_data +bpf, sockmap: Several fixes to bpf_msg_push_data +selftests/bpf: Add more tests for test_txmsg_push_pop in test_sockmap +selftests/bpf: Add push/pop checking for msg_verify_data in test_sockmap +selftests/bpf: Fix total_bytes in msg_loop_rx in test_sockmap +selftests/bpf: Fix SENDPAGE data logic in test_sockmap +selftests/bpf: Add txmsg_pass to pull/push/pop in test_sockmap +selftests/bpf: Drop netns helpers in mptcp