From 13b7d99dad8740318a668c0bb8cbd1f38a279754 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Wed, 29 Sep 2021 17:40:52 +0100 Subject: [PATCH 1/2] headers: update bpf_insn.h to dual license This header is copied from the kernel. It was relicensed from GPL-2.0-only to GPL-2.0-only OR BSD-2-Clause, so update our SPDX tag accordingly. For more details and ACKS from all copyright holders authorizing the license change see: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/commit/?id=d75fe9cb1dd062684c9fb8a4581738170365dc06 --- src/shared/linux/bpf_insn.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/linux/bpf_insn.h b/src/shared/linux/bpf_insn.h index d8d9fb220c..c459c03c51 100644 --- a/src/shared/linux/bpf_insn.h +++ b/src/shared/linux/bpf_insn.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ /* eBPF instruction mini library */ #ifndef __BPF_INSN_H #define __BPF_INSN_H From f59a1ab4b04261fb2cd8a3436b14f0eb61f9166b Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Wed, 29 Sep 2021 17:42:51 +0100 Subject: [PATCH 2/2] docs: mention that contributed code must be compatible with GPL-2.0-or-later explicitly --- docs/CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 219b2ffded..9c0f08cfc6 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -37,6 +37,7 @@ See [reporting of security vulnerabilities](SECURITY.md). * Make sure to run the test suite locally, before posting your PR. We use a CI system, meaning we don't even look at your PR, if the build and tests don't pass. * If you need to update the code in an existing PR, force-push into the same branch, overriding old commits with new versions. * After you have pushed a new version, add a comment about the new version (no notification is sent just for the commits, so it's easy to miss the update without an explicit comment). If you are a member of the systemd project on GitHub, remove the `reviewed/needs-rework` label. +* If you are copying existing code from another source (eg: a compat header), please make sure the license is compatible with GPL-2.0-or-later. ## Final Words