| commit | 9d49aea13f1e35869158abe7e314e16dc8f50ff1 | [log] [tgz] |
|---|---|---|
| author | Jakub Kicinski <kuba@kernel.org> | Thu Oct 08 15:44:50 2020 -0700 |
| committer | Jakub Kicinski <kuba@kernel.org> | Thu Oct 08 15:44:50 2020 -0700 |
| tree | c878d774db35fdb9834621e2f354973dc09f2702 | |
| parent | 9faebeb2d80065926dfbc09cb73b1bb7779a89cd [diff] | |
| parent | 3fdd47c3b40ac48e6e6e5904cf24d12e6e073a96 [diff] |
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>