diff options
author | 2020-10-08 15:44:50 -0700 | |
---|---|---|
committer | 2020-10-08 15:44:50 -0700 | |
commit | 9d49aea13f1e35869158abe7e314e16dc8f50ff1 (patch) | |
tree | c878d774db35fdb9834621e2f354973dc09f2702 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge branch 'ethtool-allow-dumping-policies-to-user-space' (diff) | |
parent | Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost (diff) | |
download | wireguard-linux-9d49aea13f1e35869158abe7e314e16dc8f50ff1.tar.xz wireguard-linux-9d49aea13f1e35869158abe7e314e16dc8f50ff1.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Small conflict around locking in rxrpc_process_event() -
channel_lock moved to bundle in next, while state lock
needs _bh() from net.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions