Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Browse source

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>

...

This commit is contained in:

Jakub Kicinski 2020-10-08 15:44:50 -07:00

parent 9faebeb2d8 3fdd47c3b4

commit 9d49aea13f

74 changed files with 1942 additions and 564 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

include/uapi/linux/rxrpc.h

View file