Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-02-07--18-00 (v6.14-rc1-317-g06ebc565ce3d) remotes/brancher/net-next-2025-02-07--21-00 (v6.14-rc1-338-ged97fa196053) ==== BASE DIFF ==== drivers/net/ethernet/renesas/rswitch.c | 7 +- drivers/net/ethernet/stmicro/stmmac/common.h | 14 +++ drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 13 +- .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 30 ++--- drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 12 +- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 96 +++++++-------- drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 9 +- .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 49 ++++---- drivers/net/ethernet/stmicro/stmmac/hwif.h | 21 ++-- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 133 ++++++++------------- drivers/net/vxlan/vxlan_core.c | 2 - include/net/inet_connection_sock.h | 3 - include/net/tcp.h | 1 + net/ipv4/inet_connection_sock.c | 12 -- net/ipv4/tcp.c | 4 +- net/ipv4/tcp_input.c | 7 +- net/ipv4/tcp_minisocks.c | 3 +- net/ipv4/tcp_output.c | 1 - net/ipv4/tcp_timer.c | 21 +++- 19 files changed, 177 insertions(+), 261 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.izDGfzDLwC b/tmp/tmp.0j4bqfDTCH index 93911d9c8ac9..ff87347ded8f 100644 --- a/tmp/tmp.izDGfzDLwC +++ b/tmp/tmp.0j4bqfDTCH @@ -3,6 +3,27 @@ selftests: net: enable profiling tc_action dbg profile patch forwarding: set timeout to 3 hours +Merge tag 'wireless-2025-02-07' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless +tcp: add tcp_rto_max_ms sysctl +tcp: add the ability to control max RTO +tcp: use tcp_reset_xmit_timer() +tcp: add a @pace_delay parameter to tcp_reset_xmit_timer() +tcp: remove tcp_reset_xmit_timer() @max_when argument +mptcp: pm: add local parameter for set_flags +mptcp: pm: change rem type of set_flags +mptcp: pm: drop skb parameter of set_flags +mptcp: pm: reuse sending nlmsg code in get_addr +mptcp: pm: add id parameter for get_addr +mptcp: pm: drop skb parameter of get_addr +mptcp: pm: make three pm wrappers static +mptcp: pm: use NL_SET_ERR_MSG_ATTR when possible +mptcp: pm: mark missing address attributes +mptcp: pm: remove duplicated error messages +mptcp: pm: userspace: use GENL_REQ_ATTR_CHECK +mptcp: pm: improve error messages +mptcp: pm: more precise error messages +mptcp: pm: userspace: flags: clearer msg if no remote addr +mptcp: pm: drop info of userspace_pm_remove_id_zero_address ipv6: mcast: extend RCU protection in igmp6_send() ndisc: extend RCU protection in ndisc_send_skb() vrf: use RCU protection in l3mdev_l3_out() @@ -11,7 +32,6 @@ arp: use RCU protection in arp_xmit() neighbour: use RCU protection in __neigh_notify() ndisc: use RCU protection in ndisc_alloc_skb() ndisc: ndisc_send_redirect() must use dev_get_by_index_rcu() -netlink: specs: add ctnetlink dump and stats dump support netlink: specs: wireless: add a spec for nl80211 netlink: specs: add s8, s16 to genetlink schemas netlink: specs: support nested structs in genetlink legacy @@ -84,7 +104,6 @@ xsk: add helper to get &xdp_desc's DMA and meta pointer in one go ice: use generic unrolled_count() macro i40e: use generic unrolled_count() macro unroll: add generic loop unroll helpers -vxlan: Remove unnecessary comments for vxlan_rcv() and vxlan_err_lookup() net: dsa: microchip: KSZ8563 register regmap alignment to 32 bit boundaries netconsole: docs: Add documentation for CPU number auto-population netconsole: selftest: test for sysdata CPU @@ -94,18 +113,11 @@ netconsole: Introduce configfs helpers for sysdata features netconsole: Helper to count number of used entries netconsole: Rename userdata to extradata netconsole: consolidate send buffers into netconsole_target struct -ptp: Add file permission checks on PHC -tcp: rename inet_csk_{delete|reset}_keepalive_timer() net: phy: dp83tg720: Add randomized polling intervals for unstable link detection net: phy: Add support for driver-specific next update time -tcp: do not export tcp_parse_mss_option() and tcp_mtup_init() net: fib_rules: annotate data-races around rule->[io]ifindex netconsole: allow selection of egress interface via MAC address net, treewide: define and use MAC_ADDR_STR_LEN -net: dsa: b53: mmap: Implement phy_enable for BCM63268 gphy -net: dsa: b53: Add phy_enable(), phy_disable() methods -net: dsa: b53: mmap: Add gphy control register as a resource -net: dsa: b53: Indicate which BCM63268 port is GPHY icmp: MUST silently discard certain extended echo requests vsock/test: Add test for SO_LINGER null ptr deref vsock: Orphan socket after transport release @@ -114,19 +126,9 @@ net: usb: qmi_wwan: fix Telit Cinterion FN990A name USB: serial: option: fix Telit Cinterion FN990A name net: usb: qmi_wwan: add Telit Cinterion FN990B composition USB: serial: option: add Telit Cinterion FN990B compositions -net: renesas: rswitch: Convert to for_each_available_child_of_node() -net: stmmac: remove old EEE methods -net: stmmac: use stmmac_set_lpi_mode() -net: stmmac: dwmac4: clear LPI_CTRL_STATUS_LPITCSE too -net: stmmac: add new MAC method set_lpi_mode() -net: stmmac: use common LPI_CTRL_STATUS bit definitions -net: stmmac: remove unnecessary LPI disable when enabling LPI -net: stmmac: clear priv->tx_path_in_lpi_mode when disabling LPI -net: stmmac: remove unnecessary priv->eee_enabled tests -net: stmmac: remove unnecessary priv->eee_active tests -net: stmmac: remove priv->dma_cap.eee test in tx_lpi methods -net: stmmac: split stmmac_init_eee() and move to phylink methods -net: stmmac: dwmac4: ensure LPIATE is cleared -net: stmmac: ensure LPI is disabled when disabling EEE -net: stmmac: delete software timer before disabling LPI net: phy: dp83td510: introduce LED framework support +MAINTAINERS: wifi: remove Kalle +MAINTAINERS: wifi: ath: remove Kalle +Merge tag 'ath-current-20250124' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath +wifi: brcmfmac: use random seed flag for BCM4355 and BCM4364 firmware +wifi: ath12k: fix handling of 6 GHz rules