diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-09-24 10:08:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-24 10:08:45 -0700 |
| commit | d2f85c9e1cf8ecdccae3e44fb2c4a36b1bbc4cb7 (patch) | |
| tree | 1616476f981ae7870a552f38ee429307379954a8 /tools/include | |
| parent | net: aquantia: memory corruption on jumbo frames (diff) | |
| parent | Merge branch 'bpf-sockmap-estab-fixes' (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2018-09-24
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) Several fixes for BPF sockmap to only allow sockets being attached in
ESTABLISHED state, from John.
2) Fix up the license to LGPL/BSD for the libc compat header which contains
fallback helpers that libbpf and bpftool is using, from Jakub.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/include')
| -rw-r--r-- | tools/include/tools/libc_compat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/include/tools/libc_compat.h b/tools/include/tools/libc_compat.h index 664ced8cb1b0..e907ba6f15e5 100644 --- a/tools/include/tools/libc_compat.h +++ b/tools/include/tools/libc_compat.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: (LGPL-2.0+ OR BSD-2-Clause) /* Copyright (C) 2018 Netronome Systems, Inc. */ #ifndef __TOOLS_LIBC_COMPAT_H |