diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2025-07-17 10:56:56 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2025-08-14 12:13:00 -0700 |
| commit | f24775c325900a683085c305fc9a403c490e667d (patch) | |
| tree | 7d06faee01d53d10f5f00fe09914e51f5b072fcb /tools/testing/selftests/net/lib/py/utils.py | |
| parent | Merge branch 'net-ethtool-support-including-flow-label-in-the-flow-hash-for-rss' (diff) | |
| parent | Merge tag 'net-6.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | linux-f24775c325900a683085c305fc9a403c490e667d.tar.gz linux-f24775c325900a683085c305fc9a403c490e667d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.17-rc2).
No conflicts.
Adjacent changes:
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
d7a276a5768f ("net: stmmac: rk: convert to suspend()/resume() methods")
de1e963ad064 ("net: stmmac: rk: put the PHY clock on remove")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'tools/testing/selftests/net/lib/py/utils.py')
0 files changed, 0 insertions, 0 deletions