Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-12-21--00-00 (v6.13-rc3-763-g70dc1453bd7a) remotes/brancher/net-next-2024-12-21--03-00 (v6.13-rc3-777-g4c87af22ea33) ==== BASE IDENTICAL ==== ==== COMMIT DIFF ==== diff --git a/tmp/tmp.PAKp1J56l7 b/tmp/tmp.6mAMHfcxrd index a89d0f02c6fc..a7ffc0395817 100644 --- a/tmp/tmp.PAKp1J56l7 +++ b/tmp/tmp.6mAMHfcxrd @@ -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 'bpf-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf +net: bridge: multicast: update multicast contex when vlan state gets changed +net: bridge: multicast: re-implement port multicast enable/disable functions net: phy: fix phy_disable_eee net: of: Support adding offset to nvmem MAC addresses dt-bindings: net: ethernet-controller: Add mac offset option @@ -51,3 +54,14 @@ net: enetc: add Tx checksum offload for i.MX95 ENETC net: stmmac: restructure the error path of stmmac_probe_config_dt() eth: fbnic: fix csr boundary for RPM RAM section udp: Deal with race between UDP socket address change and rehash +selftests/bpf: Test bpf_skb_change_tail() in TC ingress +selftests/bpf: Introduce socket_helpers.h for TC tests +selftests/bpf: Add a BPF selftest for bpf_skb_change_tail() +bpf: Check negative offsets in __bpf_skb_min_len() +tcp_bpf: Fix copied value in tcp_bpf_sendmsg +skmsg: Return copied bytes in sk_msg_memcopy_from_iter +tcp_bpf: Add sk_rmem_alloc related logic for tcp_bpf ingress redirection +tcp_bpf: Charge receive socket buffer in bpf_tcp_ingress() +selftests/bpf: Fix compilation error in get_uprobe_offset() +selftests/bpf: Use asm constraint "m" for LoongArch +bpf: Fix bpf_get_smp_processor_id() on !CONFIG_SMP