Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-12-19--00-00 (v6.13-rc2-656-g0cf5f6277c2f) remotes/brancher/net-next-2024-12-19--03-00 (v6.13-rc2-648-gd4930b098a2d) ==== BASE DIFF ==== Documentation/networking/bonding.rst | 8 ++--- drivers/net/can/m_can/m_can.c | 36 ++++++++++++++++------- drivers/net/can/m_can/m_can.h | 1 + drivers/net/can/m_can/m_can_pci.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 + drivers/net/phy/aquantia/aquantia_leds.c | 2 +- drivers/net/phy/intel-xway.c | 2 +- drivers/net/phy/mxl-gpy.c | 2 +- drivers/net/tap.c | 6 ++-- drivers/net/tun.c | 6 ++-- drivers/net/usb/qmi_wwan.c | 1 + include/linux/ptr_ring.h | 21 +++++++------ include/linux/skb_array.h | 17 ++++++----- net/sched/sch_generic.c | 4 +-- 14 files changed, 64 insertions(+), 44 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.NoMujt5SI8 b/tmp/tmp.3iKlsFwOEt index 2d62a7ed633d..88ce4700bb2e 100644 --- a/tmp/tmp.NoMujt5SI8 +++ b/tmp/tmp.3iKlsFwOEt @@ -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 +net: stmmac: restructure the error path of stmmac_probe_config_dt() +netfilter: ipset: Fix for recursive locking warning +ipvs: Fix clamp() of ip_vs_conn_tab on small memory systems eth: fbnic: fix csr boundary for RPM RAM section unroll: add generic loop unroll helpers xsk: add helper to get &xdp_desc's DMA and meta pointer in one go @@ -20,15 +23,6 @@ net: hisilicon: hns: Remove reset helpers net: hisilicon: hns: Remove unused hns_rcb_start net: hisilicon: hns: Remove unused hns_dsaf_roce_reset udp: Deal with race between UDP socket address change and rehash -netdevsim: add HDS feature -net: disallow setup single buffer XDP when tcp-data-split is enabled. -net: ethtool: add ring parameter filtering -net: devmem: add ring parameter filtering -bnxt_en: add support for hds-thresh ethtool command -net: ethtool: add support for configuring hds-thresh -bnxt_en: add support for tcp-data-split ethtool command -net: ethtool: add hds_config member in ethtool_netdev_state -bnxt_en: add support for rx-copybreak ethtool command af_unix: Add a prompt to CONFIG_AF_UNIX_OOB vsock/test: Add test for MSG_ZEROCOPY completion memory leak vsock/test: Add test for sk_error_queue memory leak @@ -45,9 +39,6 @@ gve: guard XSK operations on the existence of queues gve: guard XDP xmit NDO on existence of xdp queues gve: clean XDP queues in gve_tx_stop_ring_gqi gre: Drop ip_route_output_gre(). -vsock/virtio: Fix null-ptr-deref in vsock_stream_has_data -can: m_can: fix missed interrupts with m_can_pci -can: m_can: set init flag earlier in probe octeon_ep_vf: remove firmware stats fetch in ndo_get_stats64 octeon_ep_vf: fix race conditions in ndo_get_stats64 octeon_ep: remove firmware stats fetch in ndo_get_stats64 @@ -82,12 +73,8 @@ bnxt_en: Skip MAC loopback selftest if it is unsupported by FW bnxt_en: Skip PHY loopback ethtool selftest if unsupported by FW bnxt_en: Do not allow ethtool -m on an untrusted VF bnxt_en: Use FW defined resource limits for RoCE -ptr_ring: do not block hard interrupts in ptr_ring_resize_multiple() psample: adjust size if rate_as_probability is set net: dwmac-imx: add imx93 clock input support in RMII mode -xfrm: prevent some integer overflows in verify_ functions -net: phy: avoid undefined behavior in *_led_polarity_set() -net: sysfs: Fix deadlock situation in sysfs accesses net: phy: micrel: Dynamically control external clock of KSZ PHY octeontx2-pf: fix error handling of devlink port in rvu_rep_create() octeontx2-pf: fix netdev memory leak in rvu_rep_create() @@ -116,7 +103,6 @@ net: fib_rules: Enable flow label selector usage ipv6: fib_rules: Add flow label support ipv4: fib_rules: Reject flow label attributes net: fib_rules: Add flow label selector attributes -docs: net: bonding: fix typos net: dsa: restore dsa_software_vlan_untag() ability to operate on VLAN-untagged traffic net: ti: icssg-prueth: Add Support for Multicast filtering with VLAN in HSR mode net: ti: icssg-prueth: Add Multicast Filtering support for VLAN in MAC mode @@ -127,6 +113,3 @@ net: renesas: rswitch: use generic MPSM operation for mdio C45 net: renesas: rswitch: align mdio C45 operations with datasheet net: renesas: rswitch: use FIELD_PREP for remaining MPIC register fields net: renesas: rswitch: do not write to MPSM register at init time -net: usb: qmi_wwan: add Quectel RG255C -net: stmmac: TSO: Simplify the code flow of DMA descriptor allocations -net/mlx5e: Report rx_discards_phy via rx_dropped