Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-10-22--21-00 (v6.12-rc3-985-g09dec696630c) remotes/brancher/net-next-2024-10-23--00-00 (v6.12-rc3-985-g24b80a1da88e) ==== BASE DIFF ==== .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 73 ++++++++++++ .../net/ethernet/aquantia/atlantic/aq_ethtool.h | 8 ++ drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 3 + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 132 +++++++++++++++++++++ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c | 43 +++++++ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h | 21 ++++ .../aquantia/atlantic/hw_atl/hw_atl_llh_internal.h | 32 +++++ drivers/net/ethernet/marvell/mv643xx_eth.c | 10 +- drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 5 + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 4 + .../ethernet/marvell/octeontx2/nic/otx2_dcbnl.c | 5 + .../ethernet/marvell/octeontx2/nic/otx2_dmac_flt.c | 9 ++ .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 10 ++ .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 10 ++ 14 files changed, 358 insertions(+), 7 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.CQN40HbGga b/tmp/tmp.Gxhowq7A5A index dbc657f23165..1bcf99fc9565 100644 --- a/tmp/tmp.CQN40HbGga +++ b/tmp/tmp.Gxhowq7A5A @@ -2,18 +2,27 @@ 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: fjes: use ethtool string helpers +net: mana: use ethtool string helpers +ibmvnic: use ethtool string helpers +net: dsa: use ethtool string helpers +net: bnxt: use ethtool string helpers +netdevsim: Add trailing zero to terminate the string in nsim_nexthop_bucket_activity_write() +bnxt_en: add support for device memory tcp +net: netmem: add netmem_is_pfmemalloc() helper function +net: ethtool: add ring parameter filtering +net: devmem: add ring parameter filtering +bnxt_en: add support for header-data-split-thresh ethtool command +net: ethtool: add support for configuring header-data-split-thresh +bnxt_en: add support for tcp-data-split ethtool command +bnxt_en: add support for rx-copybreak ethtool command net: vertexcom: mse102x: Fix possible double free of TX skb selftests: netfilter: nft_flowtable.sh: make first pass deterministic netlink: specs: Add missing phy-ntf command to ethtool spec +neighbour: use kvzalloc()/kvfree() gtp: allow -1 to be specified as file description from userspace net: phylink: simplify phylink_parse_fixedlink() vsock: do not leave dangling sk pointer in vsock_create() -neighbour: Create netdev->neighbour association -neighbour: Remove bare neighbour::next pointer -neighbour: Convert iteration to use hlist+macro -neighbour: Convert seq_file functions to use hlist -neighbour: Define neigh_for_each_in_bucket -neighbour: Add hlist_node to struct neighbour mctp i2c: handle NULL header address ipv4: Prepare ip_rt_get_source() to future .flowi4_tos conversion. ipv4: Prepare ipmr_rt_fib_lookup() to future .flowi4_tos conversion. @@ -139,11 +148,7 @@ net: stmmac: Add PCI driver support for BCM8958x net: stmmac: Integrate dw25gmac into stmmac hwif handling net: stmmac: Add basic dw25gmac support in stmmac core net: stmmac: Add snps_id, dev_id to struct plat_stmmacenet_data -net: mv643xx: use ethtool_puts hv_netvsc: Fix VF namespace also in synthetic NIC NETDEV_REGISTER event -net: atlantic: support reading SFP module info -igc: Link queues to NAPI instances -igc: Link IRQs to NAPI instances net: dsa: microchip: disable EEE for KSZ879x/KSZ877x/KSZ876x netfliter: xtables: fix typo causing some targets to not load on IPv6 ipmr: Don't mark ip6mr_rtnl_msg_handlers as __initconst @@ -190,12 +195,6 @@ netpoll: remove ndo_netpoll_setup() second argument net: sched: use RCU read-side critical section in taprio_dump() net: sched: fix use-after-free in taprio_change() ipv4: Switch inet_addr_hash() to less predictable hash. -octeontx2-pf: handle otx2_mbox_get_rsp errors in otx2_dcbnl.c -octeontx2-pf: handle otx2_mbox_get_rsp errors in otx2_dmac_flt.c -octeontx2-pf: handle otx2_mbox_get_rsp errors in cn10k.c -octeontx2-pf: handle otx2_mbox_get_rsp errors in otx2_flows.c -octeontx2-pf: handle otx2_mbox_get_rsp errors in otx2_ethtool.c -octeontx2-pf: handle otx2_mbox_get_rsp errors in otx2_common.c phonet: Don't hold RTNL for route_doit(). phonet: Convert phonet_routes.lock to spinlock_t. phonet: Pass net and ifindex to rtm_phonet_notify(). @@ -213,13 +212,6 @@ net: sysctl: do not reserve an extra char in dump_cpumask temporary buffer net: sysctl: remove always-true condition net: use sock_valbool_flag() only in __sock_set_timestamps() netdevsim: macsec: pad u64 to correct length in logs -net: pcs: xpcs: remove return statements in void function -net: pcs: xpcs: rename xpcs_config_usxgmii() -net: pcs: xpcs: combine xpcs_link_up_{1000basex,sgmii}() -net: pcs: xpcs: replace open-coded mii_bmcr_encode_fixed() -net: pcs: xpcs: rearrange xpcs_link_up_1000basex() -net: pcs: xpcs: remove switch() in xpcs_link_up_1000basex() -net: pcs: xpcs: use generic register definitions ethernet: cavium: Replace deprecated PCI functions gpio: Replace deprecated PCI functions block: mtip32xx: Replace deprecated PCI functions