Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-11-03--18-00 (v6.12-rc5-1229-gfe2d09296768) remotes/brancher/net-next-2024-11-03--21-00 (v6.12-rc5-1208-g6418ff4a09be) ==== BASE DIFF ==== CREDITS | 4 + Documentation/networking/net_dim.rst | 2 +- MAINTAINERS | 1 - drivers/net/dsa/b53/b53_common.c | 3 +- drivers/net/dsa/bcm_sf2.c | 4 +- drivers/net/dsa/bcm_sf2.h | 4 +- drivers/net/dsa/bcm_sf2_cfp.c | 22 ++-- drivers/net/dsa/dsa_loop.c | 3 +- drivers/net/dsa/hirschmann/hellcreek.c | 8 +- drivers/net/dsa/microchip/ksz_common.c | 6 +- drivers/net/dsa/mt7530.c | 49 +++++++++ drivers/net/dsa/mt7530.h | 12 ++ drivers/net/dsa/mv88e6xxx/chip.c | 57 ++++------ drivers/net/dsa/mv88e6xxx/chip.h | 6 +- drivers/net/dsa/mv88e6xxx/serdes.c | 14 +-- drivers/net/dsa/mv88e6xxx/serdes.h | 8 +- drivers/net/dsa/rzn1_a5psw.c | 6 +- drivers/net/dsa/sja1105/sja1105_ethtool.c | 7 +- drivers/net/dsa/xrs700x/xrs700x.c | 6 +- drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +- drivers/net/ethernet/broadcom/bcmsysport.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 121 ++++++++++----------- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 4 +- .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 +- drivers/net/ethernet/cisco/enic/enic_ethtool.c | 2 +- drivers/net/ethernet/freescale/enetc/enetc.c | 2 +- drivers/net/ethernet/freescale/enetc/enetc_pf.c | 18 +-- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 4 +- drivers/net/ethernet/intel/ice/ice_txrx.c | 4 +- drivers/net/ethernet/intel/idpf/idpf_txrx.c | 4 +- .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 2 +- drivers/net/ethernet/mediatek/airoha_eth.c | 102 ++++++++--------- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 4 +- drivers/net/ethernet/netronome/nfp/nfd3/dp.c | 4 +- drivers/net/ethernet/netronome/nfp/nfdk/dp.c | 4 +- drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 2 +- drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 4 +- drivers/net/phy/adin.c | 6 +- drivers/net/phy/icplus.c | 3 +- drivers/net/phy/marvell.c | 12 +- drivers/net/phy/micrel.c | 6 +- drivers/net/phy/mscc/mscc_main.c | 3 +- drivers/net/phy/nxp-c45-tja11xx.c | 6 +- drivers/net/phy/nxp-cbtx.c | 2 +- drivers/net/phy/qcom/qca83xx.c | 6 +- drivers/net/virtio_net.c | 2 +- drivers/ptp/ptp_fc3.c | 5 - drivers/soc/fsl/dpio/dpio-service.c | 2 +- include/linux/compiler_types.h | 6 + include/linux/dim.h | 5 +- include/linux/ethtool.h | 2 +- include/net/tcp_ao.h | 3 +- include/uapi/linux/ethtool.h | 33 +++--- lib/dim/dim.c | 3 +- lib/dim/net_dim.c | 10 +- net/dsa/user.c | 13 +-- net/ethtool/ioctl.c | 2 +- net/ethtool/linkinfo.c | 8 +- net/ethtool/linkmodes.c | 18 +-- net/ipv4/tcp_ao.c | 42 +++---- net/ipv4/tcp_input.c | 4 +- net/ipv4/tcp_ipv4.c | 3 +- net/ipv6/tcp_ipv6.c | 4 +- net/sctp/sm_statefuns.c | 2 +- .../testing/selftests/drivers/net/netcons_basic.sh | 33 +++++- 68 files changed, 408 insertions(+), 355 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.gEV5fbKD3M b/tmp/tmp.6KMOV5qiJ6 index 65c32d6e2dda..72fbd22b9f8c 100644 --- a/tmp/tmp.gEV5fbKD3M +++ b/tmp/tmp.6KMOV5qiJ6 @@ -19,7 +19,6 @@ net: Suspend softirq when prefer_busy_poll is set net: Add napi_struct parameter irq_suspend_timeout net: ena: Remove deadcode ptp: Remove 'default y' for VMCLOCK PTP device -net: ipv4: Cache pmtu for all packet paths if multipath enabled sfc: Remove more unused functions sfc: Remove unused mcdi functions sfc: Remove unused efx_mae_mport_vf @@ -63,10 +62,6 @@ ipv6: ip6_fib: fix possible null-pointer-dereference in ipv6_route_native_seq_sh r8169: align RTL8126 EEE config with vendor driver r8169: align RTL8125/RTL8126 PHY config with vendor driver r8169: align RTL8125 EEE config with vendor driver -MAINTAINERS: Remove self from DSA entry -net: ethernet: broadcom: Fix uninitialized lockal variable -net: dsa: mt7530: Add TBF qdisc offload support -ptp: fc3: remove redundant check on variable ret net/mlx5e: do not create xdp_redirect for non-uplink rep net/mlx5e: move XDP_REDIRECT sq to dynamic allocation net/mlx5: HWS, renamed the files in accordance with naming convention @@ -105,24 +100,11 @@ vrf: Prepare vrf_process_v4_outbound() to future .flowi4_tos conversion. chcr_ktls: fix a possible null-pointer dereference in chcr_ktls_dev_add() ipvlan: Prepare ipvlan_process_v4_outbound() to future .flowi4_tos conversion. net: tcp: replace the document for "lsndtime" in tcp_sock -MAINTAINERS: update ENETC driver files and maintainers -net: enetc: add preliminary support for i.MX95 ENETC PF -net: enetc: optimize the allocation of tx_bdr -net: enetc: extract enetc_int_vector_init/destroy() from enetc_alloc_msix() -net: enetc: add i.MX95 EMDIO support -net: enetc: remove ERR050089 workaround for i.MX95 -net: enetc: build enetc_pf_common.c as a separate module -net: enetc: extract common ENETC PF parts for LS1028A and i.MX95 platforms -net: enetc: add initial netc-blk-ctrl driver support -dt-bindings: net: add bindings for NETC blocks control -dt-bindings: net: add i.MX95 ENETC support -dt-bindings: net: add compatible string for i.MX95 EMDIO sunrpc: fix one UAF issue caused by sunrpc kernel tcp socket net: macb: avoid redundant lookup for "mdio" child node in MDIO setup net: enetc: prevent VF from configuring preemptiable TCs net: xilinx: axienet: Check if Tx queue enabled net: xilinx: axienet: Enqueue Tx packets in dql before dmaengine starts -net/tcp: Add missing lockdep annotations for TCP-AO hlist traversals net: ip: make ip_route_use_hint() return drop reasons net: ip: make ip_mkroute_input/__mkroute_input return drop reasons net: ip: make ip_route_input() return drop reasons @@ -132,28 +114,6 @@ net: ip: make ip_route_input_slow() return drop reasons net: ip: make ip_mc_validate_source() return drop reason net: ip: make ip_route_input_mc() return drop reason net: ip: make fib_validate_source() support drop reasons -net: phy: use ethtool string helpers -net: bnxt: use ethtool string helpers -net: ethtool: Avoid thousands of -Wflex-array-member-not-at-end warnings -UAPI: ethtool: Use __struct_group() in struct ethtool_link_settings -bnxt_en: replace PTP spinlock with seqlock -bnxt_en: cache only 24 bits of hw counter -sctp: properly validate chunk size in sctp_sf_ootb() -net: dpaa_eth: extract hash using __be32 pointer in rx_default_dqrr() -net: dpaa_eth: add assertions about SGT entry offsets in sg_fd_to_skb() -soc: fsl_qbman: use be16_to_cpu() in qm_sg_entry_get_off() -net: dsa: mv88e6xxx: properly shutdown PPU re-enable timer on destroy -net: airoha: Simplify Tx napi logic -net: airoha: Read completion queue data in airoha_qdma_tx_napi_poll() -net: netconsole: selftests: Add userdata validation -net: netconsole: selftests: Change the IP subnet -virtio_net: rx remove premapped failover code -virtio_net: enable premapped mode for merge and small by default -virtio_net: big mode skip the unmap check -virtio-net: fix overflow inside virtnet_rq_alloc -devlink: Add documenation for OcteonTx2 AF -octeontx2-af: Knobs for NPC default rule counters -octeontx2-af: Refactor few NPC mcam APIs mm: page_frag: use __alloc_pages() to replace alloc_pages_node() mm: page_frag: reuse existing space for 'size' and 'pfmemalloc' xtensa: remove the get_order() implementation @@ -161,8 +121,4 @@ mm: page_frag: avoid caller accessing 'page_frag_cache' directly mm: page_frag: use initial zero offset for page_frag_alloc_align() mm: move the page fragment allocator from page_alloc into its own file mm: page_frag: add a test module for page_frag -net: ncsi: check for netlink-driven responses before requiring a handler -net: dsa: use ethtool string helpers net/smc: increase SMC_WR_BUF_CNT -net: tcp: Add noinline_for_tracing annotation for tcp_drop_reason() -compiler_types: Add noinline_for_tracing annotation