diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-10-09 01:44:50 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-10-09 01:44:50 +0300 |
| commit | 9d49aea13f1e35869158abe7e314e16dc8f50ff1 (patch) | |
| tree | c878d774db35fdb9834621e2f354973dc09f2702 /scripts/Makefile.modpost | |
| parent | 9faebeb2d80065926dfbc09cb73b1bb7779a89cd (diff) | |
| parent | 3fdd47c3b40ac48e6e6e5904cf24d12e6e073a96 (diff) | |
| download | linux-9d49aea13f1e35869158abe7e314e16dc8f50ff1.tar.xz | |
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 'scripts/Makefile.modpost')
0 files changed, 0 insertions, 0 deletions