diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2024-09-05 20:27:09 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-09-12 17:11:24 -0700 |
| commit | 46ae4d0a489741565520195bddebc3414781e603 (patch) | |
| tree | b364bb2c6808d4d1ae4e00c46c123caf7fffe618 /tools/perf/scripts/python/export-to-sqlite.py | |
| parent | Merge branch 'add-support-for-open-alliance-10base-t1x-macphy-serial-interface' (diff) | |
| parent | Merge tag 'net-6.11-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | wireguard-linux-46ae4d0a489741565520195bddebc3414781e603.tar.xz wireguard-linux-46ae4d0a489741565520195bddebc3414781e603.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts (sort of) and no adjacent changes.
This merge reverts commit b3c9e65eb227 ("net: hsr: remove seqnr_lock")
from net, as it was superseded by
commit 430d67bdcb04 ("net: hsr: Use the seqnr lock for frames received via interlink port.")
in net-next.
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