Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-12-14--03-03 (v6.13-rc2-515-g3c0fe3f044d5) remotes/brancher/net-next-2024-12-14--06-01 (v6.13-rc2-509-g6930aa528711) ==== BASE DIFF ==== drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- drivers/net/ethernet/stmicro/stmmac/hwif.c | 4 +- drivers/net/ethernet/stmicro/stmmac/hwif.h | 1 - drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 11 --- drivers/net/tun.c | 2 +- drivers/net/veth.c | 4 +- include/linux/skbuff.h | 31 +++++- include/net/dropreason-core.h | 18 ++++ include/net/page_pool/helpers.h | 60 +++++++++--- include/net/page_pool/types.h | 11 +-- include/net/xdp.h | 32 ++++--- kernel/bpf/cpumap.c | 2 +- net/bpf/test_run.c | 4 +- net/core/devmem.c | 10 +- net/core/filter.c | 17 ++-- net/core/page_pool.c | 121 ++++++++++++++++-------- net/core/xdp.c | 86 +++++------------ net/sched/sch_cake.c | 43 +++++---- 18 files changed, 264 insertions(+), 195 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.U4spEfvG0U b/tmp/tmp.XSJCBOWZ9T index 8f1395c1fa8a..0ba69ac35ed0 100644 --- a/tmp/tmp.U4spEfvG0U +++ b/tmp/tmp.XSJCBOWZ9T @@ -67,7 +67,6 @@ net: enetc: add UDP segmentation offload support net: enetc: add LSO support for i.MX95 ENETC PF net: enetc: update max chained Tx BD number for i.MX95 ENETC net: enetc: add Tx checksum offload for i.MX95 ENETC -net: tun: fix tun_napi_alloc_frags() ionic: use ee->offset when returning sprom data ionic: no double destroy workqueue ionic: Fix netdev notifier unregister on failure @@ -91,13 +90,6 @@ tls: implement rekey for TLS1.3 tls: block decryption when a rekey is pending net: bcmasp: Fix device node refcount leakage in bcmasp_probe() net: pse-pd: tps23881: Fix device node refcount leakage in tps23881_get_of_channels() -net: stmmac: convert to use phy_eee_rx_clock_stop() -net: stmmac: report EEE error statistics if EEE is supported -net: stmmac: remove priv->tx_lpi_enabled -net: stmmac: remove redundant code from ethtool EEE ops -net: stmmac: make EEE depend on phy->enable_tx_lpi -net: stmmac: move tx_lpi_timer tracking to phylib -net: phy: add configuration of rx clock stop mode net: hibmcge: Add nway_reset supported in this module net: hibmcge: Add reset supported in this module net: hibmcge: Add pauseparam supported in this module @@ -113,7 +105,6 @@ ethernet: Make OA_TC6 config symbol invisible net: phy: dp83822: Add support for GPIO2 clock output dt-bindings: net: dp83822: Add support for GPIO2 clock output net: renesas: rswitch: rework ts tags management -net: stmmac: Drop redundant dwxgmac_tc_ops variable net/smc: check return value of sock_recvmsg when draining clc data net/smc: check smcd_v2_ext_offset when receiving proposal msg net/smc: check v2_ext_offset/eid_cnt/ism_gid_cnt when receiving proposal msg @@ -124,14 +115,3 @@ netlink: add IGMP/MLD join/leave notifications net: mctp: Allow MCTP_NET_ANY for v2 tag control ioctls net: mctp: Don't use MCTP_INITIAL_DEFAULT_NET for a fallback net net: mctp: handle skb cleanup on sock_queue failures -Merge branch 'devmem-tcp-fixes' -page_pool: disable sync for cpu for dmabuf memory provider -page_pool: Set `dma_sync` to false for devmem memory provider -net: page_pool: create page_pool_alloc_netmem -net: page_pool: rename page_pool_alloc_netmem to *_netmems -Merge branch 'xdp-a-fistful-of-generic-changes-pt-ii' -skbuff: allow 2-4-argument skb_frag_dma_map() -xdp: make __xdp_return() MP-agnostic -xdp: get rid of xdp_frame::mem.id -page_pool: allow mixing PPs within one bulk -net_sched: sch_cake: Add drop reasons