From bdf0078aaa6087deea72bec517ca81fe4715bd07 Mon Sep 17 00:00:00 2001 From: Andy Fingerhut Date: Wed, 29 Jan 2025 03:29:48 +0000 Subject: [PATCH] Also make ebpf_common.h licensed under GPL-2.0-only or Apache-2.0 Signed-off-by: Andy Fingerhut --- backends/ebpf/runtime/ebpf_common.h | 16 +++++++--------- backends/ebpf/runtime/ebpf_kernel.h | 1 - 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/backends/ebpf/runtime/ebpf_common.h b/backends/ebpf/runtime/ebpf_common.h index a22f21c0998..fb24c2701c0 100644 --- a/backends/ebpf/runtime/ebpf_common.h +++ b/backends/ebpf/runtime/ebpf_common.h @@ -1,17 +1,15 @@ /* Copyright 2018 VMware, Inc. +SPDX-License-Identifier: (GPL-2.0-only or Apache-2.0) -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at +This file is dual-license, so that when it is included from a source +file intended to be compiled and loaded into the Linux kernel, it can +be included from a file licensed under GPL-2.0-only. - http://www.apache.org/licenses/LICENSE-2.0 +When it is included from a source file intended to be compiled and run +as a user space program, it can be included from a file licensed as +Apache-2.0. -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. */ /* diff --git a/backends/ebpf/runtime/ebpf_kernel.h b/backends/ebpf/runtime/ebpf_kernel.h index 70f5e1426d1..0bba33dd54e 100644 --- a/backends/ebpf/runtime/ebpf_kernel.h +++ b/backends/ebpf/runtime/ebpf_kernel.h @@ -9,7 +9,6 @@ be included from a file licensed under GPL-2.0-only. When it is included from a source file intended to be compiled and run as a user space program, it can be included from a file licensed as Apache-2.0. - */