diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-06-06 11:33:09 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-06-06 12:06:56 -0700 |
| commit | 62b5bf58b928f0f4fcc8bb633b63795517825d31 (patch) | |
| tree | 7331b7fad6fd30251fff3ebbd095680a1db328dd /tools/perf/scripts/python/export-to-sqlite.py | |
| parent | Merge branch 'tcp-small-code-reorg' (diff) | |
| parent | Merge tag 'net-6.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | linux-62b5bf58b928f0f4fcc8bb633b63795517825d31.tar.gz linux-62b5bf58b928f0f4fcc8bb633b63795517825d31.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/pensando/ionic/ionic_txrx.c
d9c04209990b ("ionic: Mark error paths in the data path as unlikely")
491aee894a08 ("ionic: fix kernel panic in XDP_TX action")
net/ipv6/ip6_fib.c
b4cb4a1391dc ("net: use unrcu_pointer() helper")
b01e1c030770 ("ipv6: fix possible race in __fib6_drop_pcpu_from()")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/export-to-sqlite.py')
0 files changed, 0 insertions, 0 deletions