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

anakryiko · anakryiko · commit b39ddd28d83d · 2024-08-12T13:54:39.000-07:00
Signed-off-by: Andrii Nakryiko &lt;andrii@kernel.org&gt;
diff --git a/tools/lib/bpf/btf_relocate.c b/tools/lib/bpf/btf_relocate.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
 /* Copyright (c) 2024, Oracle and/or its affiliates. */
 
 #ifndef _GNU_SOURCE

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// SPDX-License-Identifier: GPL-2.0`
	`1`	`+// SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)`
`2`	`2`	`/* Copyright (c) 2024, Oracle and/or its affiliates. */`
`3`	`3`
`4`	`4`	`#ifndef _GNU_SOURCE`