Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-12-09--12-01 (v6.13-rc1-415-gabe7528e14b5) remotes/brancher/net-next-2024-12-09--15-00 (v6.13-rc1-413-g231b1ca4666d) ==== BASE DIFF ==== MAINTAINERS | 3 +- drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 4 + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 68 +- .../net/ethernet/marvell/octeontx2/nic/Makefile | 1 + .../ethernet/marvell/octeontx2/nic/cn10k_ipsec.c | 1058 ++++++++++++++++++++ .../ethernet/marvell/octeontx2/nic/cn10k_ipsec.h | 265 +++++ .../ethernet/marvell/octeontx2/nic/otx2_common.c | 113 ++- .../ethernet/marvell/octeontx2/nic/otx2_common.h | 26 + .../ethernet/marvell/octeontx2/nic/otx2_dcbnl.c | 3 + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 19 +- .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 64 +- .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 3 + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 10 +- drivers/net/ethernet/microchip/Kconfig | 1 - drivers/net/ethernet/microchip/Makefile | 1 - drivers/net/ethernet/microchip/lan969x/Kconfig | 5 - drivers/net/ethernet/microchip/lan969x/Makefile | 13 - drivers/net/ethernet/microchip/sparx5/Kconfig | 6 + drivers/net/ethernet/microchip/sparx5/Makefile | 6 + .../microchip/{ => sparx5}/lan969x/lan969x.c | 9 +- .../microchip/{ => sparx5}/lan969x/lan969x.h | 0 .../{ => sparx5}/lan969x/lan969x_calendar.c | 0 .../microchip/{ => sparx5}/lan969x/lan969x_regs.c | 0 .../{ => sparx5}/lan969x/lan969x_vcap_ag_api.c | 0 .../{ => sparx5}/lan969x/lan969x_vcap_impl.c | 0 .../ethernet/microchip/sparx5/sparx5_calendar.c | 2 - .../net/ethernet/microchip/sparx5/sparx5_main.c | 15 +- .../net/ethernet/microchip/sparx5/sparx5_mirror.c | 3 +- .../net/ethernet/microchip/sparx5/sparx5_port.c | 2 +- drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c | 1 - 30 files changed, 1605 insertions(+), 96 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.T122svbLoa b/tmp/tmp.KNl8iOmEB6 index 0e99f7774315..665f8d973eca 100644 --- a/tmp/tmp.T122svbLoa +++ b/tmp/tmp.KNl8iOmEB6 @@ -3,10 +3,16 @@ fs/9p: use kvzalloc/kvfree to allocate struct p9_rdir and its buffer tc_action dbg profile patch forwarding: set timeout to 3 hours +ice: do not configure destination override for switchdev +tcp: check space before adding MPTCP SYN options +l2tp: Handle eth stats using NETDEV_PCPU_STAT_DSTATS. +net: renesas: rswitch: handle stop vs interrupt race net: ethernet: 8390: Add HAS_IOPORT dependency for mcf8390 Documentation: networking: Add a caveat to nexthop_compat_mode sysctl -net: phy: dp83822: Add support for GPIO2 clock output -dt-bindings: net: dp83822: Add support for GPIO2 clock output +rtnetlink: remove pad field in ndo_fdb_dump_context +rtnetlink: switch rtnl_fdb_dump() to for_each_netdev_dump() +rtnetlink: add ndo_fdb_dump_context +net: dlink: add support for reporting stats via `ethtool -S` and `ip -s -s link show` net: renesas: rswitch: enable only used MFWD features bnxt_en: Fix aggregation ID mask to prevent oops on 5760X chips net: pktgen: Use kthread_create_on_cpu() @@ -97,29 +103,6 @@ vxlan: vxlan_rcv(): Extract vxlan_hdr(skb) to a named variable vxlan: vxlan_rcv() callees: Drop the unparsed argument vxlan: vxlan_rcv() callees: Move clearing of unparsed flags out vxlan: In vxlan_rcv(), access flags through the vxlan netdevice -net: sparx5: fix the maximum frame length register -net: sparx5: fix default value of monitor ports -net: sparx5: fix FDMA performance issue -net: lan969x: fix the use of spin_lock in PTP handler -net: lan969x: fix cyclic dependency reported by depmod octeontx2-af: Fix installation of PF multicast rule -ice: cleanup Rx queue context programming functions -ice: move prefetch enable to ice_setup_rx_ctx -ice: reduce size of queue context fields -ice: use for Tx and Rx queue context data -ice: use structures to keep track of queue context size -ice: remove int_q_state from ice_tlan_ctx -lib: packing: document recently added APIs -lib: packing: add pack_fields() and unpack_fields() -lib: packing: demote truncation error in pack() to a warning in __pack() -lib: packing: create __pack() and __unpack() variants without error checking net: ethernet: oa_tc6: fix tx skb race condition between reference pointers net: ethernet: oa_tc6: fix infinite loop error when tx credits becomes 0 -cn10k-ipsec: Enable outbound ipsec crypto offload -cn10k-ipsec: Allow ipsec crypto offload for skb with SA -cn10k-ipsec: Process outbound ipsec crypto offload -cn10k-ipsec: Add SA add/del support for outb ipsec crypto offload -cn10k-ipsec: Init hardware for outbound ipsec crypto offload -octeontx2-af: Disable backpressure between CPT and NIX -octeontx2-pf: Move skb fragment map/unmap to common code -octeontx2-pf: map skb data as device writeable