| Message ID | 20200619222024.519774-1-andriin@fb.com |
|---|---|
| State | Accepted |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | [bpf-next] tools/bpftool: relicense bpftool's BPF profiler prog as dual-license GPL/BSD | expand |
On 6/20/20 12:20 AM, Andrii Nakryiko wrote: > Relicense it to be compatible with the rest of bpftool files. > > Cc: Song Liu <songliubraving@fb.com> > Suggested-by: Quentin Monnet <quentin@isovalent.com> > Signed-off-by: Andrii Nakryiko <andriin@fb.com> Applied, thanks!
diff --git a/tools/bpf/bpftool/skeleton/profiler.bpf.c b/tools/bpf/bpftool/skeleton/profiler.bpf.c index 20034c12f7c5..c9d196ddb670 100644 --- a/tools/bpf/bpftool/skeleton/profiler.bpf.c +++ b/tools/bpf/bpftool/skeleton/profiler.bpf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) // Copyright (c) 2020 Facebook #include "profiler.h" #include <linux/bpf.h> @@ -116,4 +116,4 @@ int BPF_PROG(fexit_XXX) return 0; } -char LICENSE[] SEC("license") = "GPL"; +char LICENSE[] SEC("license") = "Dual BSD/GPL";
Relicense it to be compatible with the rest of bpftool files. Cc: Song Liu <songliubraving@fb.com> Suggested-by: Quentin Monnet <quentin@isovalent.com> Signed-off-by: Andrii Nakryiko <andriin@fb.com> --- tools/bpf/bpftool/skeleton/profiler.bpf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)