diff options
| author |   Paolo Abeni <pabeni@redhat.com> | 2024-10-21 09:14:18 +0200 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2024-10-21 09:14:18 +0200 |
| commit | 91afa49a3eda8ebf902ce68f02cb16b48c879b6a (patch) | |
| tree | 3ceca7290ee7358c8e647b27f992604ce9c7ec20 /tools/perf/scripts/python/exported-sql-viewer.py | |
| parent | net: ftgmac100: correct the phy interface of NC-SI mode (diff) | |
| parent | Merge tag 'net-6.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | wireguard-linux-91afa49a3eda8ebf902ce68f02cb16b48c879b6a.tar.xz wireguard-linux-91afa49a3eda8ebf902ce68f02cb16b48c879b6a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.12-rc4).
Conflicts:
107a034d5c1e ("net/mlx5: qos: Store rate groups in a qos domain")
1da9cfd6c41c ("net/mlx5: Unregister notifier on eswitch init failure")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'tools/perf/scripts/python/exported-sql-viewer.py')
0 files changed, 0 insertions, 0 deletions