Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-01-08--18-00 (v6.13-rc5-1002-ge65ed18b12ab) remotes/brancher/net-next-2025-01-08--21-00 (v6.13-rc5-1019-gef0e15e2b9d3) ==== BASE DIFF ==== drivers/net/ethernet/hisilicon/hns3/hnae3.h | 3 - drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 96 +++++++--------------- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 1 - .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 45 ++++++++-- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c | 3 + .../ethernet/hisilicon/hns3/hns3pf/hclge_regs.c | 9 +- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 41 +++++++-- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_regs.c | 9 +- net/core/dev.c | 43 +++++++--- net/core/dev.h | 3 +- net/core/netdev-genl.c | 6 +- net/ipv4/tcp_ipv4.c | 2 +- 12 files changed, 149 insertions(+), 112 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.eXL4zjqcEN b/tmp/tmp.5RJHBECvrU index 528fdd6672c3..fa9cbe0284d9 100644 --- a/tmp/tmp.eXL4zjqcEN +++ b/tmp/tmp.5RJHBECvrU @@ -3,11 +3,30 @@ fs/9p: use kvzalloc/kvfree to allocate struct p9_rdir and its buffer tc_action dbg profile patch forwarding: set timeout to 3 hours +Revert "net/ncsi: change from ndo_set_mac_address to dev_set_mac_address" +vsock/bpf: return early if transport is not assigned +vsock/virtio: discard packets if the transport changes +net: ethernet: ti: cpsw_ale: Fix cpsw_ale_get_field() +ipv4: route: fix drop reason being overridden in ip_route_input_slow +net: stmmac: remove stmmac_lpi_entry_timer_config() +net: stmmac: split hardware LPI timer control +net: stmmac: remove unnecessary EEE handling in stmmac_release() +net: stmmac: move setup of eee_ctrl_timer to stmmac_dvr_probe() +net: stmmac: use boolean for eee_enabled and eee_active +net: stmmac: move priv->eee_active into stmmac_eee_init() +net: stmmac: move priv->eee_enabled into stmmac_eee_init() +net: stmmac: remove priv->eee_tw_timer +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: clean up stmmac_disable_eee_mode() +net: stmmac: remove redundant code from ethtool EEE ops +net: stmmac: make EEE depend on phy->enable_tx_lpi +net: stmmac: use unsigned int for eee_timer +net: stmmac: use correct type for tx_lpi_timer +net: stmmac: move tx_lpi_timer tracking to phylib +net: phy: add configuration of rx clock stop mode Merge tag 'for-net-2025-01-08' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth -net: reduce RTNL hold duration in unregister_netdevice_many_notify() -net: no longer hold RTNL while calling flush_all_backlogs() -net: no longer assume RTNL is held in flush_all_backlogs() -net: expedite synchronize_net() for cleanup_net() MAINTAINERS: remove Lars Povlsen from Microchip Sparx5 SoC MAINTAINERS: remove Noam Dagan from AMAZON ETHERNET MAINTAINERS: remove Ying Xue from TIPC @@ -25,7 +44,6 @@ sctp: sysctl: cookie_hmac_alg: avoid using current->nsproxy mptcp: sysctl: blackhole timeout: avoid using current->nsproxy mptcp: sysctl: sched: avoid using current->nsproxy mptcp: sysctl: avail sched: remove write access -net: ethernet: sunplus: Switch to ndo_eth_ioctl tools: ynl: add main install target tools: ynl: add install target for generated content tools: ynl: add initial pyproject.toml for packaging @@ -37,8 +55,6 @@ netconsole: selftest: Split the helpers from the selftest netconsole: Warn if MAX_USERDATA_ITEMS limit is exceeded net/smc: delete pointless divide by one rtase: Fix a check for error in rtase_alloc_msix() -ixgbe: Remove redundant self-assignments in ACI command execution -vmxnet3: Fix tx queue race condition with XDP net/mlx5: Fix variable not being completed when function returns net: airoha: Fix channel configuration for ETS Qdisc enic: Fix typo in comment in table indexed by link speed @@ -70,23 +86,14 @@ net: no longer reset transport_header in __netif_receive_skb_core() dt-bindings: net: Correct indentation and style in DTS example netlink: add IPv6 anycast join/leave notifications net/mlx5: use do_aux_work for PHC overflow checks -tcp: Annotate data-race around sk->sk_mark in tcp_v4_send_reset net: phy: dp83822: Add support for PHY LEDs on DP83822 net: stmmac: Unexport stmmac_rx_offset() from stmmac.h r8169: add support for RTL8125BP rev.b mctp i3c: fix MCTP I3C driver multi-thread issue selftests: drv-net: test drivers sleeping in ndo_get_stats64 -netdev: prevent accessing NAPI instances from another namespace r8169: add support for reading over-temp threshold r8169: prepare for extending hwmon support net: sched: refine software bypass handling in tc_run -net: hns3: fix kernel crash when 1588 is sent on HIP08 devices -net: hns3: fixed hclge_fetch_pf_reg accesses bar space out of bounds issue -net: hns3: initialize reset_timer before hclgevf_misc_irq_init() -net: hns3: don't auto enable misc vector -net: hns3: Resolved the issue that the debugfs query result is inconsistent. -net: hns3: fix missing features due to dev->features configuration too early -net: hns3: fixed reset failure issues caused by the incorrect reset type page_pool: check for dma_sync_size earlier net: wwan: iosm: Fix hibernation by re-binding the driver around it netlink: support dumping IPv4 multicast addresses