Merge branch 'bpf-next/net' into for-next

Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --cc include/net/tcp.h
Simple merge

diff --cc include/uapi/linux/bpf.h
Simple merge

diff --cc kernel/bpf/btf.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc tools/include/uapi/linux/bpf.h
Simple merge