Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-11-13--03-00 (v6.12-rc6-1494-gea04c4b94f71) remotes/brancher/net-next-2024-11-13--06-00 (v6.12-rc6-1498-g2fc29b7d81ed) ==== BASE DIFF ==== drivers/net/dsa/qca/qca8k-8xxx.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 98 ++++++++++++++++--------------- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + net/core/page_pool.c | 2 +- net/mptcp/protocol.c | 4 +- net/sched/cls_u32.c | 18 ++++-- 6 files changed, 69 insertions(+), 56 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.0AXWdov4yd b/tmp/tmp.7bnTXvQ5I0 index 55d7adfae7b2..5a80766c1069 100644 --- a/tmp/tmp.0AXWdov4yd +++ b/tmp/tmp.7bnTXvQ5I0 @@ -3,6 +3,7 @@ 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: stmmac: dwmac-qcom-ethqos: Enable support for XGMAC ynl: samples: Fix the wrong format specifier eth: fbnic: Add support to dump registers @@ -63,16 +64,12 @@ bonding: add ns target multicast address to slave device net: ti: icssg-prueth: Fix 1 PPS sync net/ipv4/proc: Avoid usage for seq_printf() when reading /proc/net/snmp net: Make copy_safe_from_sockptr() match documentation -dsa: qca8k: Use nested lock to avoid splat -net: sched: cls_u32: Fix u32's systematic failure to free IDR entries for hnodes. netlink: add igmp join/leave notifications net/core/net-procfs: use seq_put_decimal_ull_width() for decimal values in /proc/net/dev arm64: dts: mediatek: Set mediatek,mac-wol on DWMAC node for all boards net: stmmac: dwmac-mediatek: Fix inverted handling of mediatek,mac-wol net: ethernet: ti: am65-cpsw: enable DSCP to priority map for RX net: ethernet: ti: am65-cpsw: update pri_thread_map as per IEEE802.1Q-2014 -eth: bnxt: use page pool for head frags -net: page_pool: do not count normal frag allocation in stats net: dsa: microchip: Add LAN9646 switch support to KSZ DSA driver dt-bindings: net: dsa: microchip: Add LAN9646 switch support stmmac: dwmac-intel-plat: fix call balance of tx_clk handling routines @@ -92,12 +89,14 @@ ipv6/udp: Add 4-tuple hash for connected socket ipv4/udp: Add 4-tuple hash for connected socket net/udp: Add 4-tuple hash list basis net/udp: Add a new struct for hash2 slot -mptcp: fix possible integer overflow in mptcp_reset_tout_timer vdpa/mlx5: Fix PA offset with unaligned starting iotlb map +bpf: Fix mismatched RCU unlock flavour in bpf_out_neigh_v6 vdpa/mlx5: Fix error path during device add +bpf: Add sk_is_inet and IS_ICSK check in tls_sw_has_ctx_tx/rx vp_vdpa: fix id_table array not null terminated error virtio_pci: Fix admin vq cleanup by using correct info pointer vDPA/ifcvf: Fix pci_read_config_byte() return code handling Fix typo in vringh_test.c vdpa: solidrun: Fix UB bug with devres vsock/virtio: Initialization of the dangling pointer occurring in vsk->trans +selftests/bpf: Use -4095 as the bad address for bits iterator