Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-03-18--09-00 (v6.14-rc6-1493-gd7b62de6c1ab) remotes/brancher/net-next-2025-03-18--12-00 (v6.14-rc6-1507-gb3fe9f084196) ==== BASE DIFF ==== .../devicetree/bindings/net/can/fsl,flexcan.yaml | 13 + .../bindings/net/can/renesas,rcar-canfd.yaml | 2 +- Documentation/networking/batman-adv.rst | 2 +- Documentation/networking/devlink/bnxt.rst | 2 + drivers/net/can/flexcan/flexcan-core.c | 45 ++- drivers/net/can/flexcan/flexcan.h | 1 + drivers/net/can/rcar/rcar_canfd.c | 28 +- drivers/net/can/usb/ucan.c | 43 ++- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 8 +- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.c | 9 +- drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 95 ++++-- drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h | 2 + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 85 ++++- drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 143 ++++++-- drivers/net/ethernet/intel/ice/ice.h | 1 + drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 9 +- drivers/net/ethernet/intel/ice/ice_lib.c | 8 +- drivers/net/ethernet/intel/ice/ice_main.c | 18 ++ drivers/net/ethernet/intel/ice/ice_ptp_consts.h | 75 +---- drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 19 +- drivers/net/ethernet/intel/ice/ice_ptp_hw.h | 35 +- drivers/net/ethernet/intel/ice/ice_txrx.c | 27 +- drivers/net/ethernet/intel/ice/ice_txrx.h | 2 + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 26 ++ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 13 +- drivers/net/ethernet/intel/ixgbe/ixgbe_type_e610.h | 3 + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 3 +- .../net/ethernet/mellanox/mlx5/core/en/tc/meter.c | 5 + .../net/ethernet/mellanox/mlx5/core/en/tc/meter.h | 13 + drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 146 ++++++++- drivers/net/ethernet/mellanox/mlx5/core/esw/qos.h | 12 +- .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 8 +- .../mellanox/mlx5/core/steering/hws/fs_hws.c | 231 ++++++++++++- .../mellanox/mlx5/core/steering/hws/fs_hws.h | 24 ++ .../mellanox/mlx5/core/steering/hws/fs_hws_pools.c | 41 +-- drivers/net/ethernet/microsoft/mana/gdma_main.c | 14 +- drivers/net/ethernet/qlogic/qed/qed_main.c | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 4 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 - drivers/net/ethernet/ti/am65-cpsw-nuss.c | 32 +- drivers/net/phy/Makefile | 2 +- drivers/net/phy/phy-caps.h | 63 ++++ drivers/net/phy/phy-core.c | 328 ++----------------- drivers/net/phy/phy.c | 37 +-- drivers/net/phy/phy_caps.c | 359 +++++++++++++++++++++ drivers/net/phy/phy_device.c | 16 +- drivers/net/phy/phylib.h | 6 + drivers/net/phy/phylink.c | 355 ++++++-------------- drivers/net/usb/cdc_ether.c | 7 + drivers/net/usb/r8152.c | 6 + drivers/net/usb/r8153_ecm.c | 6 + include/linux/ethtool.h | 8 + include/linux/mlx5/fs.h | 1 + include/linux/netdev_features.h | 8 +- include/linux/netdevice.h | 2 + include/linux/phy.h | 31 -- include/linux/phylink.h | 8 + include/linux/skbuff.h | 2 + include/linux/udp.h | 16 + include/net/mana/gdma.h | 11 +- include/net/netns/ipv4.h | 11 + include/net/tcp.h | 81 +++-- include/net/udp.h | 1 + include/net/udp_tunnel.h | 22 ++ include/uapi/linux/batman_adv.h | 18 +- include/uapi/linux/tcp.h | 9 +- net/batman-adv/Makefile | 2 +- net/batman-adv/bat_algo.c | 8 +- net/batman-adv/bat_iv_ogm.c | 105 +++--- net/batman-adv/bat_v.c | 28 +- net/batman-adv/bat_v_elp.c | 16 +- net/batman-adv/bat_v_ogm.c | 42 +-- net/batman-adv/bitarray.c | 2 +- net/batman-adv/bridge_loop_avoidance.c | 106 +++--- net/batman-adv/distributed-arp-table.c | 68 ++-- net/batman-adv/distributed-arp-table.h | 4 +- net/batman-adv/fragmentation.c | 2 +- net/batman-adv/gateway_client.c | 38 +-- net/batman-adv/gateway_common.c | 8 +- net/batman-adv/hard-interface.c | 158 +++++---- net/batman-adv/hard-interface.h | 12 +- net/batman-adv/log.c | 2 +- net/batman-adv/log.h | 10 +- net/batman-adv/main.c | 42 +-- net/batman-adv/main.h | 24 +- .../{soft-interface.c => mesh-interface.c} | 197 +++++------ .../{soft-interface.h => mesh-interface.h} | 22 +- net/batman-adv/multicast.c | 182 +++++------ net/batman-adv/multicast_forw.c | 30 +- net/batman-adv/netlink.c | 180 +++++------ net/batman-adv/netlink.h | 2 +- net/batman-adv/network-coding.c | 64 ++-- net/batman-adv/originator.c | 58 ++-- net/batman-adv/routing.c | 42 +-- net/batman-adv/send.c | 36 +-- net/batman-adv/send.h | 4 +- net/batman-adv/tp_meter.c | 30 +- net/batman-adv/trace.h | 2 +- net/batman-adv/translation-table.c | 198 ++++++------ net/batman-adv/translation-table.h | 4 +- net/batman-adv/tvlv.c | 26 +- net/batman-adv/types.h | 78 ++--- net/can/af_can.c | 14 +- net/can/af_can.h | 12 +- net/can/bcm.c | 1 + net/can/isotp.c | 1 + net/can/proc.c | 46 +-- net/can/raw.c | 5 +- net/ethtool/common.c | 2 + net/ethtool/common.h | 7 - net/ipv4/bpf_tcp_ca.c | 2 +- net/ipv4/ip_output.c | 3 +- net/ipv4/tcp.c | 2 +- net/ipv4/tcp_dctcp.c | 2 +- net/ipv4/tcp_dctcp.h | 2 +- net/ipv4/tcp_input.c | 120 ++++--- net/ipv4/tcp_ipv4.c | 34 +- net/ipv4/tcp_minisocks.c | 6 +- net/ipv4/tcp_offload.c | 10 +- net/ipv4/tcp_output.c | 20 +- net/ipv4/udp.c | 13 +- net/ipv4/udp_offload.c | 167 +++++++++- net/ipv4/udp_tunnel_core.c | 14 + net/ipv6/route.c | 3 +- net/ipv6/tcp_ipv6.c | 26 +- net/ipv6/tcpv6_offload.c | 21 +- net/ipv6/udp.c | 2 + net/ipv6/udp_offload.c | 5 + net/netfilter/nf_log_syslog.c | 8 +- net/smc/smc_pnet.c | 8 +- 134 files changed, 3023 insertions(+), 2040 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.tYwrdQTdRD b/tmp/tmp.Zn8hVuWRDx index 6da25855bea4..e468a42c43a4 100644 --- a/tmp/tmp.tYwrdQTdRD +++ b/tmp/tmp.Zn8hVuWRDx @@ -70,16 +70,6 @@ Merge tag 'for-net-2025-03-14' of git://git.kernel.org/pub/scm/linux/kernel/git/ net: mdio: mdio-i2c: Add support for single-byte SMBus operations net: phy: sfp: Add support for SMBus module access net: airoha: fix CONFIG_DEBUG_FS check -can: add protocol counter for AF_CAN sockets -dt-bindings: can: fsl,flexcan: add i.MX94 support -can: flexcan: add transceiver capabilities -dt-bindings: can: fsl,flexcan: add transceiver capabilities -can: flexcan: disable transceiver during system PM -can: flexcan: only change CAN state when link up in system PM -can: rcar_canfd: Fix page entries in the AFL list -dt-bindings: can: renesas,rcar-canfd: Fix typo in pattern properties for R-Car V4M -can: statistics: use atomic access in hot path -can: ucan: fix out of bound read in strscpy() source net: ti: icssg-prueth: Add lock to stats page_pool: Track DMA-mapped pages and unmap them when destroying the pool page_pool: Turn dma_sync and dma_sync_cpu fields into a bitmap @@ -131,7 +121,6 @@ mptcp: pm: split netlink and in-kernel init net: vlan: don't propagate flags on open net: don't relock netdev when on qdisc_create replay xsk: fix an integer overflow in xp_create_and_assign_umem() -xfrm: ipcomp: Call pskb_may_pull in ipcomp_input net: fix NULL pointer dereference in l3mdev_l3_rcv ptp: ocp: reject unsupported periodic output flags broadcom: fix supported flag check in periodic output function @@ -197,78 +186,8 @@ inet: frags: change inet_frag_kill() to defer refcount updates ipv4: frags: remove ipq_put() inet: frags: add inet_frag_putn() helper net: skbuff: Remove unused skb_add_data() -igb: Prevent IPCFGN write resetting autoneg advertisement register sctp: handle error of sctp_sf_heartbeat() in sctp_sf_do_asconf() ipv6: Set errno after ip_fib_metrics_init() in ip6_route_info_create(). -ipv6: Fix memleak of nhc_pcpu_rth_output in fib_check_nh_v6_gw(). -net: ipv6: fix TCP GSO segmentation with NAT -udp_tunnel: use static call for GRO hooks when possible -udp_tunnel: create a fastpath GRO lookup. -net: mana: Support holes in device list reply msg -net: fix uninitialised access in mii_nway_restart() and cleanup error handling -net: ethernet: ti: am65-cpsw: Fix NAPI registration sequence -net: ti: cpsw: Add metadata support for xdp mode -net: mana: Add metadata support for xdp mode -net: ethernet: mediatek: Add metadata support for xdp mode -net: octeontx2: Add metadata support for xdp mode -net: netsec: Add metadata support for xdp mode -net: mvpp2: Add metadata support for xdp mode -net: mvneta: Add metadata support for xdp mode -qed: remove cast to pointers passed to kfree -MAINTAINERS: add new file ntmp.h to ENETC driver -net: enetc: add loopback support for i.MX95 ENETC PF -net: enetc: add VLAN filtering support for i.MX95 ENETC PF -net: enetc: move generic VLAN hash filter functions to enetc_pf_common.c -net: enetc: move generic VLAN filter interfaces to enetc-core -net: enetc: enable RSS feature by default -net: enetc: add RSS support for i.MX95 ENETC PF -net: enetc: make enetc_set_rss_key() reusable -net: enetc: add set/get_rss_table() to enetc_si_ops -net: enetc: add debugfs interface to dump MAC filter -net: enetc: add MAC filter for i.MX95 ENETC PF -net: enetc: move generic MAC filterng interfaces to enetc-core -net: enetc: add command BD ring support for i.MX95 ENETC -net: enetc: add initial netc-lib driver to support NTMP -Merge branch 'net-phy-rework-linkmodes-handling-in-a-dedicated-file' -net: phylink: Use phy_caps to get an interface's capabilities and modes -net: phylink: Convert capabilities to linkmodes using phy_caps -net: phylink: Add a mapping between MAC_CAPS and LINK_CAPS -net: phy: drop phy_settings and the associated lookup helpers -net: phylink: Use phy_caps_lookup for fixed-link configuration -net: phy: phy_device: Use link_capabilities lookup for PHY aneg config -net: phy: phy_caps: Allow looking-up link caps based on speed and duplex -net: phy: phy_caps: Implement link_capabilities lookup by linkmode -net: phy: phy_caps: Introduce phy_caps_valid -net: phy: phy_caps: Move __set_linkmode_max_speed to phy_caps -net: phy: phy_caps: Move phy_speeds to phy_caps -net: phy: Use an internal, searchable storage for the linkmodes -net: ethtool: Export the link_mode_params definitions -Merge branch 'net-stmmac-avoid-unnecessary-work-in-stmmac_release-stmmac_dvr_remove' -net: stmmac: remove unnecessary stmmac_mac_set() in stmmac_release() -net: stmmac: remove redundant racy tear-down in stmmac_dvr_remove() -net: phylink: expand on .pcs_config() method documentation -cdc_ether|r8152: ThinkPad Hybrid USB-C/A Dock quirk -stmmac: intel: Fix warning message for return value in intel_tsn_lane_is_available() -Merge branch 'net-phy-clean-up-phy-package-mmd-access-functions' -net: phy: remove unused functions phy_package_[read|write]_mmd -net: phy: move PHY package MMD access function declarations from phy.h to phylib.h -Merge branch 'mlx5-support-hws-flow-meter-sampler-actions-in-fs-core' -net/mlx5: fs, add support for dest flow sampler HWS action -net/mlx5: fs, add support for flow meters HWS action -net/mlx5: fs, add API for sharing HWS action by refcount -Merge branch 'tcp-accecn' -tcp: Pass flags to __tcp_send_ack -tcp: add new TCP_TW_ACK_OOW state and allow ECN bits in TOS -tcp: AccECN support to tcp_add_backlog -gro: prevent ACE field corruption & better AccECN handling -gso: AccECN support -tcp: helpers for ECN mode handling -tcp: rework {__,}tcp_ecn_check_ce() -> tcp_data_ecn_check() -tcp: extend TCP flags to allow AE bit/ACE field -tcp: use BIT() macro in include/net/tcp.h -tcp: create FLAG_TS_PROGRESS -tcp: reorganize tcp_in_ack_event() and tcp_count_delivered() -net/smc: use the correct ndev to find pnetid by pnetid table Merge branch 'tcp-add-some-rto-min-and-delack-max-bpf_getsockopt-supports' selftests/bpf: Add bpf_getsockopt() for TCP_BPF_DELACK_MAX and TCP_BPF_RTO_MIN tcp: bpf: Support bpf_getsockopt for TCP_BPF_DELACK_MAX