diff options
author | 2024-05-09 09:59:29 -0700 | |
---|---|---|
committer | 2024-05-09 10:01:01 -0700 | |
commit | e7073830cc8b52ef3df7dd150e4dac7706e0e104 (patch) | |
tree | e257cb163ac414e82acf319ab8cdd98ad4434036 /tools/perf/scripts/python/call-graph-from-postgresql.py | |
parent | l2tp: Support several sockets with same IP/port quadruple (diff) | |
parent | Merge tag 'net-6.9-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
download | wireguard-linux-e7073830cc8b52ef3df7dd150e4dac7706e0e104.tar.xz wireguard-linux-e7073830cc8b52ef3df7dd150e4dac7706e0e104.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts.
Adjacent changes:
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
35d92abfbad8 ("net: hns3: fix kernel crash when devlink reload during initialization")
2a1a1a7b5fd7 ("net: hns3: add command queue trace for hns3")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions