diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-04-09 20:46:01 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-04-09 20:48:35 -0700 |
| commit | 8859a44ea0df92bccdc942ef15781ebbfe0ad9f3 (patch) | |
| tree | bffdd602a7d6ad5060df41789af75965f9d58270 /net/tipc/net.c | |
| parent | 6c5e6b4ccc1bb9ac56579a9aed25d517d2318be6 (diff) | |
| parent | 4e04e7513b0fa2fe8966a1c83fb473f1667e2810 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:
MAINTAINERS
- keep Chandrasekar
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
- simple fix + trust the code re-added to param.c in -next is fine
include/linux/bpf.h
- trivial
include/linux/ethtool.h
- trivial, fix kdoc while at it
include/linux/skmsg.h
- move to relevant place in tcp.c, comment re-wrapped
net/core/skmsg.c
- add the sk = sk // sk = NULL around calls
net/tipc/crypto.c
- trivial
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/tipc/net.c')
| -rw-r--r-- | net/tipc/net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c index 3f927949bb23..a130195af188 100644 --- a/net/tipc/net.c +++ b/net/tipc/net.c @@ -89,7 +89,7 @@ * - A spin lock to protect the registry of kernel/driver users (reg.c) * - A global spin_lock (tipc_port_lock), which only task is to ensure * consistency where more than one port is involved in an operation, - * i.e., whe a port is part of a linked list of ports. + * i.e., when a port is part of a linked list of ports. * There are two such lists; 'port_list', which is used for management, * and 'wait_list', which is used to queue ports during congestion. * |