bpf: Relicense disassembler as GPL-2.0-only OR BSD-2-Clause

Some time ago we dual-licensed both libbpf and bpftool through commits 1bc38b8ff6cc ("libbpf: relicense libbpf as LGPL-2.1 OR BSD-2-Clause") and 907b22365115 ("tools: bpftool: dual license all files"). The latter missed the disasm.{c,h} which we pull in via kernel/bpf/ such that we have a single source for verifier as well as bpftool asm dumping, see also f4ac7e0b5cc8 ("bpf: move instruction printing into a separate file"). It is currently GPL-2.0-only and missed the conversion in 907b22365115, therefore relicense the two as GPL-2.0-only OR BSD-2-Clause as well.

Daniel Borkmann committed 5 years ago

Commit 49ca6151 parent 9e9fb762 files · +2 −2Browse files

Unified · Split

2 files

kernel/bpf/disasm.c +1 −1
kernel/bpf/disasm.h +1 −1

kernel/bpf/disasm.c+1−1

@@ -1,4 +1,4 @@
1	// SPDX-License-Identifier: GPL-2.0-only	1	// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2	/* Copyright (c) 2011-2014 PLUMgrid, http://plumgrid.com	2	/* Copyright (c) 2011-2014 PLUMgrid, http://plumgrid.com
3	* Copyright (c) 2016 Facebook	3	* Copyright (c) 2016 Facebook
4	*/	4	*/

kernel/bpf/disasm.h+1−1

@@ -1,4 +1,4 @@
1	/* SPDX-License-Identifier: GPL-2.0-only */	1	/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
2	/* Copyright (c) 2011-2014 PLUMgrid, http://plumgrid.com	2	/* Copyright (c) 2011-2014 PLUMgrid, http://plumgrid.com
3	* Copyright (c) 2016 Facebook	3	* Copyright (c) 2016 Facebook
4	*/	4	*/