diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-08-17 16:16:29 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-08-17 16:16:29 +0200 |
| commit | c87866ede44ad7da6b296d732221dc34ce1b154d (patch) | |
| tree | 2df013f6824e9252a1b30b1ea7f1681e454c6218 /kernel/bpf/reuseport_array.c | |
| parent | 55bccf1f93e4bf1b3209cc8648ab53f10f4601a5 (diff) | |
| parent | 7c60610d476766e128cc4284bb6349732cbd6606 (diff) | |
Merge tag 'v5.14-rc6' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/bpf/reuseport_array.c')
| -rw-r--r-- | kernel/bpf/reuseport_array.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/reuseport_array.c b/kernel/bpf/reuseport_array.c index 4838922f723d..93a55391791a 100644 --- a/kernel/bpf/reuseport_array.c +++ b/kernel/bpf/reuseport_array.c @@ -102,7 +102,7 @@ static void reuseport_array_free(struct bpf_map *map) /* * ops->map_*_elem() will not be able to access this * array now. Hence, this function only races with - * bpf_sk_reuseport_detach() which was triggerred by + * bpf_sk_reuseport_detach() which was triggered by * close() or disconnect(). * * This function and bpf_sk_reuseport_detach() are |