diff options
| author | David S. Miller <[email protected]> | 2018-02-04 21:46:58 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2018-02-04 21:46:58 +0000 |
| commit | a6b88814ab541d386d793f6df260a3e4d5cccb11 (patch) | |
| tree | a7c633be819bb450edab3beebd1a9a0cfba8bb72 /net/ipv4/tcp_ulp.c | |
| parent | Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | Merge branch 'libbpf-xdp-support' (diff) | |
| download | kernel-a6b88814ab541d386d793f6df260a3e4d5cccb11.tar.gz kernel-a6b88814ab541d386d793f6df260a3e4d5cccb11.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2018-02-02
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) support XDP attach in libbpf, from Eric.
2) minor fixes, from Daniel, Jakub, Yonghong, Alexei.
====================
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/ipv4/tcp_ulp.c')
0 files changed, 0 insertions, 0 deletions