diff options
| author | David S. Miller <davem@davemloft.net> | 2020-04-25 04:26:14 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-04-25 04:26:14 +0300 |
| commit | 167ff131cb3dffccab8bb4d65a8d72e7c5ffc398 (patch) | |
| tree | 4e1748d884532e9386371f9636f52db61eea9d79 /include | |
| parent | 3554e54a46125030c534820c297ed7f6c3907e24 (diff) | |
| parent | e1cebd841b0aa1ceda771706d54a0501986a3c88 (diff) | |
| download | linux-167ff131cb3dffccab8bb4d65a8d72e7c5ffc398.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2020-04-24
The following pull-request contains BPF updates for your *net* tree.
We've added 17 non-merge commits during the last 5 day(s) which contain
a total of 19 files changed, 203 insertions(+), 85 deletions(-).
The main changes are:
1) link_update fix, from Andrii.
2) libbpf get_xdp_id fix, from David.
3) xadd verifier fix, from Jann.
4) x86-32 JIT fixes, from Luke and Wang.
5) test_btf fix, from Stanislav.
6) freplace verifier fix, from Toke.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/bpf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 2e29a671d67e..7bbf1b65be10 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -1642,7 +1642,7 @@ union bpf_attr { * ifindex, but doesn't require a map to do so. * Return * **XDP_REDIRECT** on success, or the value of the two lower bits - * of the **flags* argument on error. + * of the *flags* argument on error. * * int bpf_sk_redirect_map(struct sk_buff *skb, struct bpf_map *map, u32 key, u64 flags) * Description |