aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-21 00:53:14 +09:00
Code Issues Packages Projects Releases Wiki Activity
Files
39aead8373b3c20bb5965c024dfb51a94e526151
lkl_linux/net/openvswitch/conntrack.c
Jakub Kicinski 9d49aea13f 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>
2020-10-08 15:44:50 -07:00

60 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink