From patchwork Tue Sep 10 12:26:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1983170 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=abqN4lI8; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4X32yW4g9qz1y1s for ; Tue, 10 Sep 2024 22:27:15 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snzx6-0007Ui-QD; Tue, 10 Sep 2024 08:26:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1snzx4-0007RG-ON for qemu-devel@nongnu.org; Tue, 10 Sep 2024 08:26:34 -0400 Received: from mail-lf1-x134.google.com ([2a00:1450:4864:20::134]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1snzx2-0003eg-Ja for qemu-devel@nongnu.org; Tue, 10 Sep 2024 08:26:34 -0400 Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-5365aec6fc1so4838377e87.3 for ; Tue, 10 Sep 2024 05:26:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725971190; x=1726575990; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DwmV2MeWXY+eAh46YLB4XlIS9tILH+3xHMSDQuLSaLg=; b=abqN4lI8r2rigxVheCEZIS4a7Kjt4UReF50AXMxXgJIAhSTAb5tZTFJT3d9PVfAemH 4+SndUicypvIu6x4iazla7kmhYaLq4GpERi1sVcwPSKF9gX0tG31LaaoVLCrXWLDn4+2 67ZegP3MK6ROWDnvgEVcn3mky8Sb1/cR7LUVbNyiVAt4kJjsEas7qntzBT0dq8ADi7us dKuAIv7SJgchX/+Sq+eeWXh/2jwd0lDYfqMWOPPeBzk183IFPsXnfiOL4fqWQIQyVVvG bgJPTevPWrykLrrY1uXsk+i9zF/jVkgpngUlQEgwkR5W5Cj8NyrBRbT9k9pmC1LzNz0G ot8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725971190; x=1726575990; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DwmV2MeWXY+eAh46YLB4XlIS9tILH+3xHMSDQuLSaLg=; b=TxwJ3v7+/B+GcKPCrbE+7f+S/i/qycliSH+fw5MESKnSLQf14uqbpAmEXzyNfY60to PsIKty5le5vG911Q4ABo9wB/Xofa/rSmDMtGMFb2kM2zP7c0iH3VZkeqIXJaR9j5pktC bZQ3WeE8LNtyGgUgaG5VLB6SrlrD9WBt069tpXSYvbrlntQuEab3c5co5xEqoj8akA+Z 2b2FhRgMZXvGrBYPZeN+OHu4ocOn9lQWbClU1yX+Vva8EuxyuQNg+/d5UUPiRC2Mnewe +Ihe4HzDEPuayugcK794UIbNPebu+TJWp5XPWgbajxB5YQlJW5e9Vwkcg35qVVHAgJj+ F31g== X-Gm-Message-State: AOJu0Yycg1hFvgS5qFJIHnVuSESfEZMQdXz/EN5Kd6w6qh9023hAnZep ta7XNrgJsccmVKEIi/jDW7/tnJSCXGKWl/CO/RHUs9jYebALLg1kwPXOpcyJXcYipJmtob+Rb8d l X-Google-Smtp-Source: AGHT+IF89AkzhBhynHvCYSIF7yZDpCgJkbbFgO5WP8Zvsk+sbPJI8gNBLuuSHLAOGX94mh5kJZFNXQ== X-Received: by 2002:a05:6512:104b:b0:536:5625:511a with SMTP id 2adb3069b0e04-536587f82d0mr8388155e87.47.1725971190425; Tue, 10 Sep 2024 05:26:30 -0700 (PDT) Received: from m1x-phil.lan ([176.187.217.32]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8d25c82eaesm478295966b.118.2024.09.10.05.26.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Sep 2024 05:26:29 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Weil , qemu-trivial@nongnu.org, Paolo Bonzini , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Subject: [PATCH v2 1/5] NSIS: Simplify license description Date: Tue, 10 Sep 2024 14:26:14 +0200 Message-ID: <20240910122618.33056-2-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240910122618.33056-1-philmd@linaro.org> References: <20240910122618.33056-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::134; envelope-from=philmd@linaro.org; helo=mail-lf1-x134.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Since the "2 | 3+" expression can be simplified as "2+", it is pointless to mention the GPLv3 license. Add the corresponding SPDX identifier to remove all doubt. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- qemu.nsi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qemu.nsi b/qemu.nsi index 564d617d11..b186f223e1 100644 --- a/qemu.nsi +++ b/qemu.nsi @@ -7,7 +7,7 @@ ; This program is free software: you can redistribute it and/or modify ; it under the terms of the GNU General Public License as published by ; the Free Software Foundation, either version 2 of the License, or -; (at your option) version 3 or any later version. +; (at your option) any later version. ; ; This program is distributed in the hope that it will be useful, ; but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,6 +16,8 @@ ; ; You should have received a copy of the GNU General Public License ; along with this program. If not, see . +; +; SPDX-License-Identifier: GPL-2.0-or-later ; NSIS_WIN32_MAKENSIS From patchwork Tue Sep 10 12:26:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1983175 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=LhK3o5iV; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4X32zK60Dpz1y1s for ; Tue, 10 Sep 2024 22:27:57 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snzxC-0007pI-GT; Tue, 10 Sep 2024 08:26:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1snzxA-0007gq-FU for qemu-devel@nongnu.org; Tue, 10 Sep 2024 08:26:40 -0400 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1snzx8-0003fc-Pg for qemu-devel@nongnu.org; Tue, 10 Sep 2024 08:26:40 -0400 Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-5c3c3b63135so5894118a12.3 for ; Tue, 10 Sep 2024 05:26:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725971197; x=1726575997; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=u2Lzz72uA0m2TQJZ42QIGkbSlS4YxmlVZGvzRWw4vAw=; b=LhK3o5iVtHACOww/vJYRBMs+Q+fESt+u5jtWK9e9DgrU80Hca9TnefnZS52aqUqhnq FnIAT+Q2Pp7Fdcu3O/2cHwbaEw2BV8hy3jKPi9X/xYHWWhzPTtFYrm7C7sPz+Ge6UyCv HISqgqnNH3CfWhoz34GRdIbDVg6rpI2+cOLv3TE5Ek0AWH92JsAv7m0+Wtl72aeKaOHZ +wWPvExSWgYJYQir0D0nPmv8W76A/4mZ8y98sKCI9HySSaiQ7NMl8oX5xdmhyhB+/cCb RcWncHs4XLhvlOZN9ejIbNdd3qXMoXBgwclv22zgjXzX5NjlJOUohv+R8LaIkld9HKI0 YKuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725971197; x=1726575997; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=u2Lzz72uA0m2TQJZ42QIGkbSlS4YxmlVZGvzRWw4vAw=; b=fKosT7nXMupVHRs1sw7wrCYtSCEOmPaz+DJf2WasWZKt0sy4nLfVHFOVyWFLdcUHha YQEk36WvcnZtmQtiK5tUgpOk+VzGfaAhON1MMOxKoHL4CE5lvtlj3DtO2qiWdRPFdz9c LVWxxZki/XwOYoI0gOkD7fIwOK/NFp7Hz2lLHhS5uzqfMGPTW0eeZcVssC+Evu3gCoRQ 4TVEo5qHe+x6FHN/PXNzGuT+ugCwUnXnZw0S3vqPd3zl6CvwVn4ChWxkFJUQyfugvBfb jyHP00w5luz1CFPeNnWFs5DChbeaL45thYZsEU/haYQ/fUL8DyxlCwv59nV1zu73cQXU vGGA== X-Gm-Message-State: AOJu0Yy2orZUZsy9sPG/tKGRdCyWyVOgWrbxEiR/hWZ+1cUYDLvRJwyu 4W5tNxQbWoWRetGSraQZ2ZqUkPVvg9XaaJ/0smhk8yiGypi7j5DUK6yYxwNtsRD2n13+7T03fKU W X-Google-Smtp-Source: AGHT+IHP2xUMYwNTGa132hPW/frSnnAJjKWOf1ndbm8IcFMD4+X1TQFeWanAqRYzTZHZlKA2/hpSmA== X-Received: by 2002:a17:907:7f29:b0:a7a:ba59:3164 with SMTP id a640c23a62f3a-a8ffae0b899mr55866066b.53.1725971196780; Tue, 10 Sep 2024 05:26:36 -0700 (PDT) Received: from m1x-phil.lan ([176.187.217.32]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8d25c72815sm478828866b.140.2024.09.10.05.26.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Sep 2024 05:26:36 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Weil , qemu-trivial@nongnu.org, Paolo Bonzini , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Subject: [PATCH v2 2/5] tests/functional: Correct typo in test_netdev_ethtool.py SPDX tag Date: Tue, 10 Sep 2024 14:26:15 +0200 Message-ID: <20240910122618.33056-3-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240910122618.33056-1-philmd@linaro.org> References: <20240910122618.33056-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::531; envelope-from=philmd@linaro.org; helo=mail-ed1-x531.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Cc: Alex Bennée Fixes: 9f95111474 ("tests/avocado: re-factor igb test to avoid timeouts") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- tests/functional/test_netdev_ethtool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functional/test_netdev_ethtool.py b/tests/functional/test_netdev_ethtool.py index d5b911c918..ee1a397bd2 100755 --- a/tests/functional/test_netdev_ethtool.py +++ b/tests/functional/test_netdev_ethtool.py @@ -5,7 +5,7 @@ # This test leverages ethtool's --test sequence to validate network # device behaviour. # -# SPDX-License-Identifier: GPL-2.0-or-late +# SPDX-License-Identifier: GPL-2.0-or-later from unittest import skip from qemu_test import QemuSystemTest, Asset From patchwork Tue Sep 10 12:26:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1983174 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=vzA3Dzd5; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4X32zH6Zplz1y1s for ; Tue, 10 Sep 2024 22:27:55 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snzxJ-0008E5-C5; Tue, 10 Sep 2024 08:26:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1snzxH-00088O-KX for qemu-devel@nongnu.org; Tue, 10 Sep 2024 08:26:47 -0400 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1snzxF-0003gJ-8Q for qemu-devel@nongnu.org; Tue, 10 Sep 2024 08:26:47 -0400 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-a8d64b27c45so256501366b.3 for ; Tue, 10 Sep 2024 05:26:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725971203; x=1726576003; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+vrkvajXPf/EtPELJKNM1kw1PD2rFV2IUbx9FKaBuF4=; b=vzA3Dzd55wtfIGhIQ5kX/UECix6z74ET9zNhsc2Dzt9XzALniDYP2r1e2da+x+DsF3 U35IMluBJ8HjYlbaEASP0kQRnN0C1mQtJhnBuuEFwhmEu2a9qfnIY2IewKy8Lu9agf1h kqLcMJ6tMkghaX1RVEHtzwclBcg0J6V7TJzMLkVnf5dbezAYiH9MCPNGG9VeUPsZcoZK rKfbI+ukSVcAJgoOBWWcp+vc9fUvC88ndytJVX9xdisuBk+jqdnMqU3uFvjTYwAYbphk rmIdy3yzIE/lNfcJNfYfStECkyy6gkBT6ptgDtuCdeved/N0lFlCqKAQpMACas93UT2P oSaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725971203; x=1726576003; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+vrkvajXPf/EtPELJKNM1kw1PD2rFV2IUbx9FKaBuF4=; b=f3bLX6Yi8nc/HPMn4z9wQgJtCKfubiaH5mwMKc+9ZcmDUReVbCpRpW1MHlaq2OupMT 8HO9aVpopuwi6EdIOzJ4zaZ1oGcjZbyvRzV9jKvYYgRc4XmRruETNEYasaDfplI9IQgA 59bEzCwu5Ogc0o9Ok5XnYgeP/srqIb11I7Eh+/oLADD4x1XPuZwU3yiBjh2ajO8pnuS+ fEa9EZDtUeE/bAlEBfRwVfafGicb0jf4OlYheBQ3wemJ6Twklu/O8UtfJqADFEkvGISb l9NSuHo5t7NqvzVDcVTXsY3i+W6CQIKO76g5sVNwL52vA+guibUo6ZAiYOmIPaxVLy+k zHjg== X-Gm-Message-State: AOJu0Yyg1xF1Zmvn/g7Pcku0YxMPnP5Y99s5Kfb0G+kgjamQgVW8tUPb 8be6cm7ESxaLd0BNDAm9Fr274r4UoRJLlP9UKJorX/q1X0J/9XbPmVOWPjwQ3U7lm3tbGRVKrqF W X-Google-Smtp-Source: AGHT+IFNpdKmytUrizqAAhJkk6SksttS1RfXzs/GqR1xXMzMMYnnXqlx/Yq4ovo9pXy8I/mIIYQDJA== X-Received: by 2002:a17:907:7f16:b0:a8a:9054:8394 with SMTP id a640c23a62f3a-a8ffa866000mr63386866b.0.1725971203178; Tue, 10 Sep 2024 05:26:43 -0700 (PDT) Received: from m1x-phil.lan ([176.187.217.32]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8d25831875sm483500366b.11.2024.09.10.05.26.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Sep 2024 05:26:42 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Weil , qemu-trivial@nongnu.org, Paolo Bonzini , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Subject: [PATCH v2 3/5] license: Update deprecated SPDX tag LGPL-2.0+ to LGPL-2.0-or-later Date: Tue, 10 Sep 2024 14:26:16 +0200 Message-ID: <20240910122618.33056-4-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240910122618.33056-1-philmd@linaro.org> References: <20240910122618.33056-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=philmd@linaro.org; helo=mail-ej1-x62d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The 'LGPL-2.0+' license identifier has been deprecated since license list version 2.0rc2 [1] and replaced by the 'LGPL-2.0-or-later' [2] tag. [1] https://spdx.org/licenses/LGPL-2.0+.html [2] https://spdx.org/licenses/LGPL-2.0-or-later.html Mechanical patch running: $ sed -i -e s/LGPL-2.0+/LGPL-2.0-or-later/ \ $(git grep -l 'SPDX-License-Identifier: LGPL-2.0+$') Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- include/gdbstub/syscalls.h | 2 +- include/gdbstub/user.h | 2 +- target/alpha/cpu-param.h | 2 +- target/arm/cpu-param.h | 2 +- target/cris/cpu-param.h | 2 +- target/hppa/cpu-param.h | 2 +- target/i386/cpu-param.h | 2 +- target/m68k/cpu-param.h | 2 +- target/microblaze/cpu-param.h | 2 +- target/mips/cpu-param.h | 2 +- target/openrisc/cpu-param.h | 2 +- target/ppc/cpu-param.h | 2 +- target/sh4/cpu-param.h | 2 +- target/sparc/cpu-param.h | 2 +- target/sparc/insns.decode | 2 +- gdbstub/gdbstub.c | 2 +- gdbstub/syscalls.c | 2 +- gdbstub/system.c | 2 +- gdbstub/user-target.c | 2 +- gdbstub/user.c | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/include/gdbstub/syscalls.h b/include/gdbstub/syscalls.h index 54ff7245a1..d63228e96b 100644 --- a/include/gdbstub/syscalls.h +++ b/include/gdbstub/syscalls.h @@ -3,7 +3,7 @@ * * Copyright (c) 2023 Linaro Ltd * - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef _SYSCALLS_H_ diff --git a/include/gdbstub/user.h b/include/gdbstub/user.h index 3b8358e3da..654986d483 100644 --- a/include/gdbstub/user.h +++ b/include/gdbstub/user.h @@ -3,7 +3,7 @@ * * Copyright (c) 2022 Linaro Ltd * - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef GDBSTUB_USER_H diff --git a/target/alpha/cpu-param.h b/target/alpha/cpu-param.h index 5ce213a9a1..c21ddf1afd 100644 --- a/target/alpha/cpu-param.h +++ b/target/alpha/cpu-param.h @@ -2,7 +2,7 @@ * Alpha cpu parameters for qemu. * * Copyright (c) 2007 Jocelyn Mayer - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef ALPHA_CPU_PARAM_H diff --git a/target/arm/cpu-param.h b/target/arm/cpu-param.h index fa6cae0e3a..bed29613c8 100644 --- a/target/arm/cpu-param.h +++ b/target/arm/cpu-param.h @@ -2,7 +2,7 @@ * ARM cpu parameters for qemu. * * Copyright (c) 2003 Fabrice Bellard - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef ARM_CPU_PARAM_H diff --git a/target/cris/cpu-param.h b/target/cris/cpu-param.h index b31b742c0d..4960e89d24 100644 --- a/target/cris/cpu-param.h +++ b/target/cris/cpu-param.h @@ -2,7 +2,7 @@ * CRIS cpu parameters for qemu. * * Copyright (c) 2007 AXIS Communications AB - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef CRIS_CPU_PARAM_H diff --git a/target/hppa/cpu-param.h b/target/hppa/cpu-param.h index 473d489f01..ef3200f0f3 100644 --- a/target/hppa/cpu-param.h +++ b/target/hppa/cpu-param.h @@ -2,7 +2,7 @@ * PA-RISC cpu parameters for qemu. * * Copyright (c) 2016 Richard Henderson - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef HPPA_CPU_PARAM_H diff --git a/target/i386/cpu-param.h b/target/i386/cpu-param.h index 5e15335203..8c75abe141 100644 --- a/target/i386/cpu-param.h +++ b/target/i386/cpu-param.h @@ -2,7 +2,7 @@ * i386 cpu parameters for qemu. * * Copyright (c) 2003 Fabrice Bellard - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef I386_CPU_PARAM_H diff --git a/target/m68k/cpu-param.h b/target/m68k/cpu-param.h index 39dcbcece8..5bbe623ba7 100644 --- a/target/m68k/cpu-param.h +++ b/target/m68k/cpu-param.h @@ -2,7 +2,7 @@ * m68k cpu parameters for qemu. * * Copyright (c) 2005-2007 CodeSourcery - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef M68K_CPU_PARAM_H diff --git a/target/microblaze/cpu-param.h b/target/microblaze/cpu-param.h index e530fead1c..00efb509e3 100644 --- a/target/microblaze/cpu-param.h +++ b/target/microblaze/cpu-param.h @@ -2,7 +2,7 @@ * MicroBlaze cpu parameters for qemu. * * Copyright (c) 2009 Edgar E. Iglesias - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef MICROBLAZE_CPU_PARAM_H diff --git a/target/mips/cpu-param.h b/target/mips/cpu-param.h index 6f6ac1688f..f3a37e2dbe 100644 --- a/target/mips/cpu-param.h +++ b/target/mips/cpu-param.h @@ -1,7 +1,7 @@ /* * MIPS cpu parameters for qemu. * - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef MIPS_CPU_PARAM_H diff --git a/target/openrisc/cpu-param.h b/target/openrisc/cpu-param.h index fbfc0f568b..6169ed9f55 100644 --- a/target/openrisc/cpu-param.h +++ b/target/openrisc/cpu-param.h @@ -2,7 +2,7 @@ * OpenRISC cpu parameters for qemu. * * Copyright (c) 2011-2012 Jia Liu - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef OPENRISC_CPU_PARAM_H diff --git a/target/ppc/cpu-param.h b/target/ppc/cpu-param.h index 77c5ed9a67..9c481b9f6c 100644 --- a/target/ppc/cpu-param.h +++ b/target/ppc/cpu-param.h @@ -2,7 +2,7 @@ * PowerPC cpu parameters for qemu. * * Copyright (c) 2007 Jocelyn Mayer - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef PPC_CPU_PARAM_H diff --git a/target/sh4/cpu-param.h b/target/sh4/cpu-param.h index a7cdb7edb6..a30ba992b3 100644 --- a/target/sh4/cpu-param.h +++ b/target/sh4/cpu-param.h @@ -2,7 +2,7 @@ * SH4 cpu parameters for qemu. * * Copyright (c) 2005 Samuel Tardieu - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef SH4_CPU_PARAM_H diff --git a/target/sparc/cpu-param.h b/target/sparc/cpu-param.h index 82293fb844..14105dc18b 100644 --- a/target/sparc/cpu-param.h +++ b/target/sparc/cpu-param.h @@ -1,7 +1,7 @@ /* * Sparc cpu parameters for qemu. * - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef SPARC_CPU_PARAM_H diff --git a/target/sparc/insns.decode b/target/sparc/insns.decode index 5fd478191a..d434a30106 100644 --- a/target/sparc/insns.decode +++ b/target/sparc/insns.decode @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.0+ +# SPDX-License-Identifier: LGPL-2.0-or-later # # Sparc instruction decode definitions. # Copyright (c) 2023 Richard Henderson diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index d08568cea0..b1def7e71d 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -20,7 +20,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . * - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #include "qemu/osdep.h" diff --git a/gdbstub/syscalls.c b/gdbstub/syscalls.c index 4e1295b782..4ddd5cae06 100644 --- a/gdbstub/syscalls.c +++ b/gdbstub/syscalls.c @@ -7,7 +7,7 @@ * Copyright (c) 2003-2005 Fabrice Bellard * Copyright (c) 2023 Linaro Ltd * - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #include "qemu/osdep.h" diff --git a/gdbstub/system.c b/gdbstub/system.c index 1ad87fe7fd..c9f236e94f 100644 --- a/gdbstub/system.c +++ b/gdbstub/system.c @@ -7,7 +7,7 @@ * Copyright (c) 2003-2005 Fabrice Bellard * Copyright (c) 2022 Linaro Ltd * - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #include "qemu/osdep.h" diff --git a/gdbstub/user-target.c b/gdbstub/user-target.c index b5e01fd8b0..22bf4008c0 100644 --- a/gdbstub/user-target.c +++ b/gdbstub/user-target.c @@ -4,7 +4,7 @@ * Copyright (c) 2003-2005 Fabrice Bellard * Copyright (c) 2022 Linaro Ltd * - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #include "qemu/osdep.h" diff --git a/gdbstub/user.c b/gdbstub/user.c index b36033bc7a..0b4bfa9c48 100644 --- a/gdbstub/user.c +++ b/gdbstub/user.c @@ -6,7 +6,7 @@ * Copyright (c) 2003-2005 Fabrice Bellard * Copyright (c) 2022 Linaro Ltd * - * SPDX-License-Identifier: LGPL-2.0+ + * SPDX-License-Identifier: LGPL-2.0-or-later */ #include "qemu/osdep.h" From patchwork Tue Sep 10 12:26:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1983179 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=Lytm0O25; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4X32zx1S8Qz1y1s for ; Tue, 10 Sep 2024 22:28:29 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snzxa-0000Fb-2w; Tue, 10 Sep 2024 08:27:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1snzxY-00007n-6p for qemu-devel@nongnu.org; Tue, 10 Sep 2024 08:27:04 -0400 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1snzxT-0003gt-8n for qemu-devel@nongnu.org; Tue, 10 Sep 2024 08:27:03 -0400 Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-5c3c30e6649so668635a12.2 for ; Tue, 10 Sep 2024 05:26:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725971210; x=1726576010; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NxicRzYkmvOskoD/w+UVeNTJwRS2R7t5eol06ROza4s=; b=Lytm0O25CYaJEPtzl8PssjB07zGLrJuAmXSUnu9R5WP3kq9QxzG0HN3TDZjekfNJC6 emYEL5KfljC0TQST7TKsbeB0eM0bcIKrPTzRgMwzkl3vhtPHiNZd6nGyCVbtba4SYHLJ jBqIjibrlVAVLJrYfc38k4SIQVi4Zb8ErJlW7ONngCXQrQWZOIh+++CQdX6BFCp9fOKZ 78VaYhEoyBO9BGw3HSY2ROqPIF7pjE8AzQMaT5uCOQv87V5s77CtiM+vJwFZzfXrQL+M qyFDUdE5fr+p76UKLS/mj1Sl3253jtH/EevH5TP3hyMxtvsWCJ/pJl0+f0XIhUTudsCQ kHGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725971210; x=1726576010; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NxicRzYkmvOskoD/w+UVeNTJwRS2R7t5eol06ROza4s=; b=si8zuBwcses/PPivMAYkQBxD4XX7axINAczWUNtj7RwKBhw0MsAT4EKfzQ8N29lfLT LNE/HBnKTGaea1wCySwiGsLUod86bJVGGKEp9Cr8o23zSkD2SIx1xKlt0pHPbJ5ezoH9 P/nCEBv0UsDi79ItQQOfsY85uOloTFcXagt69dUwurCiTppmcbXoqkpO7Ls4KEbtn/HW EgOIwNNUL9YJwPS5XME2VZ8rGnfDRX9AVuwXl2JJLBv7LC5HHy30mJ/wDw+V7hrJ1SR9 BQebVOIfDlqJRkWlLezeOajtRQn4EN40oeKZHlksrB3rIp6RPXRVLNtDcxzKuXekIief nsxA== X-Gm-Message-State: AOJu0YzCAVJeDG49bNACMYCaQF5RSHfq0x0h8uFuJl0NLRSJCy5C6JSt M2Ya+JMeoueb5s7l1TvAwHbywEUG5qdfEy2C8OHUWAUlH/0IxdhiwAsVPZ6u2bwZyP2OWcUJfH9 S X-Google-Smtp-Source: AGHT+IEWbmqCW4isrelMC/Q812pWqlHTYlksWqqGqXgNFrfbtU0CScphGUh8LevT1TFKyigx8C4fuA== X-Received: by 2002:a05:6402:3903:b0:5be:fdc0:e704 with SMTP id 4fb4d7f45d1cf-5c3dc79323dmr9566347a12.10.1725971209820; Tue, 10 Sep 2024 05:26:49 -0700 (PDT) Received: from m1x-phil.lan ([176.187.217.32]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c3ebd523casm4207838a12.58.2024.09.10.05.26.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Sep 2024 05:26:49 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Weil , qemu-trivial@nongnu.org, Paolo Bonzini , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Subject: [PATCH v2 4/5] license: Update deprecated SPDX tag GPL-2.0+ to GPL-2.0-or-later Date: Tue, 10 Sep 2024 14:26:17 +0200 Message-ID: <20240910122618.33056-5-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240910122618.33056-1-philmd@linaro.org> References: <20240910122618.33056-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::529; envelope-from=philmd@linaro.org; helo=mail-ed1-x529.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The 'GPL-2.0+' license identifier has been deprecated since license list version 2.0rc2 [1] and replaced by the 'GPL-2.0-or-later' [2] tag. [1] https://spdx.org/licenses/GPL-2.0+.html [2] https://spdx.org/licenses/GPL-2.0-or-later.html Mechanical patch running: $ sed -i -e s/GPL-2.0+/GPL-2.0-or-later/ \ $(git grep -lP 'SPDX-License-Identifier: \W+GPL-2.0\+[ $]' \ | egrep -v '^linux-headers|^include/standard-headers') Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- hw/core/uboot_image.h | 2 +- include/hw/nvram/fw_cfg_acpi.h | 2 +- include/hw/usb/dwc2-regs.h | 2 +- include/hw/virtio/virtio-acpi.h | 2 +- target/riscv/cpu-param.h | 2 +- target/s390x/cpu-param.h | 2 +- hw/nvram/fw_cfg-acpi.c | 2 +- hw/virtio/virtio-acpi.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/core/uboot_image.h b/hw/core/uboot_image.h index 18ac293359..e4dcfb08f0 100644 --- a/hw/core/uboot_image.h +++ b/hw/core/uboot_image.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2008 Semihalf * diff --git a/include/hw/nvram/fw_cfg_acpi.h b/include/hw/nvram/fw_cfg_acpi.h index b39eb0490f..dfd2a44ef0 100644 --- a/include/hw/nvram/fw_cfg_acpi.h +++ b/include/hw/nvram/fw_cfg_acpi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * ACPI support for fw_cfg * diff --git a/include/hw/usb/dwc2-regs.h b/include/hw/usb/dwc2-regs.h index 0bf3f2aa17..523b112c5e 100644 --- a/include/hw/usb/dwc2-regs.h +++ b/include/hw/usb/dwc2-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) */ /* * Imported from the Linux kernel file drivers/usb/dwc2/hw.h, commit * a89bae709b3492b478480a2c9734e7e9393b279c ("usb: dwc2: Move diff --git a/include/hw/virtio/virtio-acpi.h b/include/hw/virtio/virtio-acpi.h index cace2a315f..cdfbd943ae 100644 --- a/include/hw/virtio/virtio-acpi.h +++ b/include/hw/virtio/virtio-acpi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * ACPI support for virtio */ diff --git a/target/riscv/cpu-param.h b/target/riscv/cpu-param.h index 1fbd64939d..25686192c0 100644 --- a/target/riscv/cpu-param.h +++ b/target/riscv/cpu-param.h @@ -2,7 +2,7 @@ * RISC-V cpu parameters for qemu. * * Copyright (c) 2017-2018 SiFive, Inc. - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef RISCV_CPU_PARAM_H diff --git a/target/s390x/cpu-param.h b/target/s390x/cpu-param.h index 11d23b600d..a05ffcf78d 100644 --- a/target/s390x/cpu-param.h +++ b/target/s390x/cpu-param.h @@ -2,7 +2,7 @@ * S/390 cpu parameters for qemu. * * Copyright (c) 2009 Ulrich Hecht - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef S390_CPU_PARAM_H diff --git a/hw/nvram/fw_cfg-acpi.c b/hw/nvram/fw_cfg-acpi.c index 58cdcd3121..2e6ef89b98 100644 --- a/hw/nvram/fw_cfg-acpi.c +++ b/hw/nvram/fw_cfg-acpi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Add fw_cfg device in DSDT * diff --git a/hw/virtio/virtio-acpi.c b/hw/virtio/virtio-acpi.c index 230a669500..85becef03c 100644 --- a/hw/virtio/virtio-acpi.c +++ b/hw/virtio/virtio-acpi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * virtio ACPI Support * From patchwork Tue Sep 10 12:26:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1983171 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=mFvkNpYa; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4X32yj44yDz1y1s for ; Tue, 10 Sep 2024 22:27:25 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snzxX-0008Vf-KM; Tue, 10 Sep 2024 08:27:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1snzxV-0008UR-NC for qemu-devel@nongnu.org; Tue, 10 Sep 2024 08:27:01 -0400 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1snzxS-0003gs-Uc for qemu-devel@nongnu.org; Tue, 10 Sep 2024 08:27:01 -0400 Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-a8d60e23b33so266562366b.0 for ; Tue, 10 Sep 2024 05:26:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725971216; x=1726576016; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uebG3UYhZWjA7+RVa/FeUtQC5xM5kZiuSF2P1ZpvjPY=; b=mFvkNpYaRPF739WstR3d81mPj/wvuKP6dcuyNAoUtQfxxuW526fxCFiNl8WR7rZU5m WKj/mV2ApcpZoYejnHz212aUzF4PoC5NQCBMEukI6RrpIH0caDPgYSJmpilNg31Sq/hV aeRyUBt5m7Smqk77NBjovjfrptIRntHrIr09DlCuAFrZO5DvUF/l883hxMpLsidzolha 9iskUMchD22qjn9vWh853j8UzYEh5jJTcStIlTyo/0FAKLxbryMsEMNrEsKW73WPpRkZ NKwSIV4ygeXI/Br9Iqms6pUAJ1gMhxViIqTjL0av7L4MCxhp5tmERmLit6VBrxoEw7GW ktaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725971216; x=1726576016; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uebG3UYhZWjA7+RVa/FeUtQC5xM5kZiuSF2P1ZpvjPY=; b=gKIieE8FyGNjbXqYj1jF4rM2M/IswJl3ZiVuP8EBa0K3RcIHUTdg9zFe6nlzXqXggp Ap5k9dwaNFFbC2It7mwIuoqKN1CiURyrIIaHsbaFg0PYE/73KdF7a9n/E8nnNfuNWntY yofFuieXZ74EcYuMO6Ohq0LRbjcxfRRUjsXS+E2L7VUlwvq7gkkob2T3FI1lOLGTLUVL eYmWV3AM1z46lyiG9qiUqvklGYqbU3bnyh85Z/ViD5+dgPY4BbaNsmUlelKAUSbfoD6p c243uczP1Fwadi1QZA5vueigZg4Pbh5VhzKIY5UkdOMKL+WOpwqhUsfFipgo6iESAWmN 9tjQ== X-Gm-Message-State: AOJu0YxA8RcasRPxJRDaUIg6la/IDA+NlrHvTkcVikheIrAr+n2n/pyV 2rKgx1s2/YBvk7uVhtx+t0LXQT42ifvx9T2+yQOPF1aDQskao56WhKoHv7Py12IvRdTaY+Qemij 6 X-Google-Smtp-Source: AGHT+IHeRgF9aNYORg7LaHogjpt8z/whO8P1EKBDHfsh7ZQ/2GUi4JkKm/bUpWSrzRjpGpTIUC4XWw== X-Received: by 2002:a17:906:7951:b0:a8d:4f8e:f64d with SMTP id a640c23a62f3a-a8ffae0b9a5mr53263666b.54.1725971216565; Tue, 10 Sep 2024 05:26:56 -0700 (PDT) Received: from m1x-phil.lan ([176.187.217.32]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8d25d40cebsm472637466b.200.2024.09.10.05.26.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Sep 2024 05:26:56 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Weil , qemu-trivial@nongnu.org, Paolo Bonzini , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Subject: [PATCH v2 5/5] license: Update deprecated SPDX tag GPL-2.0 to GPL-2.0-only Date: Tue, 10 Sep 2024 14:26:18 +0200 Message-ID: <20240910122618.33056-6-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240910122618.33056-1-philmd@linaro.org> References: <20240910122618.33056-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62a; envelope-from=philmd@linaro.org; helo=mail-ej1-x62a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The 'GPL-2.0' license identifier has been deprecated since license list version 3.0 [1] and replaced by the 'GPL-2.0-only' tag [2]. [1] https://spdx.org/licenses/GPL-2.0.html [2] https://spdx.org/licenses/GPL-2.0-only.html Mechanical patch running: $ sed -i -e s/GPL-2.0/GPL-2.0-only/ \ $(git grep -l 'SPDX-License-Identifier: GPL-2.0[ $]' \ | egrep -v '^linux-headers|^include/standard-headers') Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- hw/m68k/bootinfo.h | 2 +- hw/net/igb_regs.h | 2 +- include/qemu/crc-ccitt.h | 2 +- tests/tcg/loongarch64/system/regdef.h | 2 +- linux-user/alpha/syscall.tbl | 2 +- linux-user/alpha/syscallhdr.sh | 2 +- linux-user/arm/syscallhdr.sh | 2 +- linux-user/hppa/syscall.tbl | 2 +- linux-user/hppa/syscallhdr.sh | 2 +- linux-user/i386/syscallhdr.sh | 2 +- linux-user/m68k/syscall.tbl | 2 +- linux-user/m68k/syscallhdr.sh | 2 +- linux-user/microblaze/syscall.tbl | 2 +- linux-user/microblaze/syscallhdr.sh | 2 +- linux-user/mips/syscall_o32.tbl | 2 +- linux-user/mips/syscallhdr.sh | 2 +- linux-user/mips64/syscall_n32.tbl | 2 +- linux-user/mips64/syscall_n64.tbl | 2 +- linux-user/mips64/syscallhdr.sh | 2 +- linux-user/ppc/syscall.tbl | 2 +- linux-user/ppc/syscallhdr.sh | 2 +- linux-user/s390x/syscall.tbl | 2 +- linux-user/s390x/syscallhdr.sh | 2 +- linux-user/sh4/syscall.tbl | 2 +- linux-user/sh4/syscallhdr.sh | 2 +- linux-user/sparc/syscall.tbl | 2 +- linux-user/sparc/syscallhdr.sh | 2 +- linux-user/x86_64/syscallhdr.sh | 2 +- linux-user/xtensa/syscall.tbl | 2 +- linux-user/xtensa/syscallhdr.sh | 2 +- scripts/kernel-doc | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/hw/m68k/bootinfo.h b/hw/m68k/bootinfo.h index 0e6e3eea87..70c1dc0e8c 100644 --- a/hw/m68k/bootinfo.h +++ b/hw/m68k/bootinfo.h @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note + * SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note * * Bootinfo tags from linux bootinfo.h and bootinfo-mac.h: * This is an easily parsable and extendable structure containing all diff --git a/hw/net/igb_regs.h b/hw/net/igb_regs.h index e5a47eab64..4dc4c31da2 100644 --- a/hw/net/igb_regs.h +++ b/hw/net/igb_regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * This is copied + edited from kernel header files in * drivers/net/ethernet/intel/igb diff --git a/include/qemu/crc-ccitt.h b/include/qemu/crc-ccitt.h index 8918dafe07..ce28e29720 100644 --- a/include/qemu/crc-ccitt.h +++ b/include/qemu/crc-ccitt.h @@ -8,7 +8,7 @@ * * From Linux kernel v5.10 include/linux/crc-ccitt.h * - * SPDX-License-Identifier: GPL-2.0 + * SPDX-License-Identifier: GPL-2.0-only */ #ifndef CRC_CCITT_H diff --git a/tests/tcg/loongarch64/system/regdef.h b/tests/tcg/loongarch64/system/regdef.h index faa09b2377..b586b4e86d 100644 --- a/tests/tcg/loongarch64/system/regdef.h +++ b/tests/tcg/loongarch64/system/regdef.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2021 Loongson Technology Corporation Limited */ diff --git a/linux-user/alpha/syscall.tbl b/linux-user/alpha/syscall.tbl index 3000a2e8ee..3fa3ea436d 100644 --- a/linux-user/alpha/syscall.tbl +++ b/linux-user/alpha/syscall.tbl @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note # # system call numbers and entry vectors for alpha # diff --git a/linux-user/alpha/syscallhdr.sh b/linux-user/alpha/syscallhdr.sh index 55cafe6abf..6da0c957e2 100644 --- a/linux-user/alpha/syscallhdr.sh +++ b/linux-user/alpha/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/linux-user/arm/syscallhdr.sh b/linux-user/arm/syscallhdr.sh index 4c952b2cfb..692fd6a76e 100644 --- a/linux-user/arm/syscallhdr.sh +++ b/linux-user/arm/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/linux-user/hppa/syscall.tbl b/linux-user/hppa/syscall.tbl index aabc37f8ca..6361e97974 100644 --- a/linux-user/hppa/syscall.tbl +++ b/linux-user/hppa/syscall.tbl @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note # # system call numbers and entry vectors for parisc # diff --git a/linux-user/hppa/syscallhdr.sh b/linux-user/hppa/syscallhdr.sh index ac91a95762..bf1c1d4f30 100644 --- a/linux-user/hppa/syscallhdr.sh +++ b/linux-user/hppa/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/linux-user/i386/syscallhdr.sh b/linux-user/i386/syscallhdr.sh index b2eca96db7..938a793d2a 100644 --- a/linux-user/i386/syscallhdr.sh +++ b/linux-user/i386/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/linux-user/m68k/syscall.tbl b/linux-user/m68k/syscall.tbl index 79c2d24c89..98d90a3e53 100644 --- a/linux-user/m68k/syscall.tbl +++ b/linux-user/m68k/syscall.tbl @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note # # system call numbers and entry vectors for m68k # diff --git a/linux-user/m68k/syscallhdr.sh b/linux-user/m68k/syscallhdr.sh index eeb4d01d34..39b11dd05e 100644 --- a/linux-user/m68k/syscallhdr.sh +++ b/linux-user/m68k/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/linux-user/microblaze/syscall.tbl b/linux-user/microblaze/syscall.tbl index b11395a20c..04bbd854b5 100644 --- a/linux-user/microblaze/syscall.tbl +++ b/linux-user/microblaze/syscall.tbl @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note # # system call numbers and entry vectors for microblaze # diff --git a/linux-user/microblaze/syscallhdr.sh b/linux-user/microblaze/syscallhdr.sh index f55dce8a62..b42b669154 100644 --- a/linux-user/microblaze/syscallhdr.sh +++ b/linux-user/microblaze/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/linux-user/mips/syscall_o32.tbl b/linux-user/mips/syscall_o32.tbl index d560c467a8..9c3fe03bdc 100644 --- a/linux-user/mips/syscall_o32.tbl +++ b/linux-user/mips/syscall_o32.tbl @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note # # system call numbers and entry vectors for mips # diff --git a/linux-user/mips/syscallhdr.sh b/linux-user/mips/syscallhdr.sh index 761e3e47dd..cd7043ef5a 100644 --- a/linux-user/mips/syscallhdr.sh +++ b/linux-user/mips/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/linux-user/mips64/syscall_n32.tbl b/linux-user/mips64/syscall_n32.tbl index 9220909526..dc228e6b25 100644 --- a/linux-user/mips64/syscall_n32.tbl +++ b/linux-user/mips64/syscall_n32.tbl @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note # # system call numbers and entry vectors for mips # diff --git a/linux-user/mips64/syscall_n64.tbl b/linux-user/mips64/syscall_n64.tbl index 9cd1c34f31..ddd59079ce 100644 --- a/linux-user/mips64/syscall_n64.tbl +++ b/linux-user/mips64/syscall_n64.tbl @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note # # system call numbers and entry vectors for mips # diff --git a/linux-user/mips64/syscallhdr.sh b/linux-user/mips64/syscallhdr.sh index ed5a45165a..a4339b2041 100644 --- a/linux-user/mips64/syscallhdr.sh +++ b/linux-user/mips64/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/linux-user/ppc/syscall.tbl b/linux-user/ppc/syscall.tbl index 8f052ff405..51f4efb199 100644 --- a/linux-user/ppc/syscall.tbl +++ b/linux-user/ppc/syscall.tbl @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note # # system call numbers and entry vectors for powerpc # diff --git a/linux-user/ppc/syscallhdr.sh b/linux-user/ppc/syscallhdr.sh index 6c44e0eaad..6e8b93d673 100644 --- a/linux-user/ppc/syscallhdr.sh +++ b/linux-user/ppc/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/linux-user/s390x/syscall.tbl b/linux-user/s390x/syscall.tbl index 0690263df1..f713903bcc 100644 --- a/linux-user/s390x/syscall.tbl +++ b/linux-user/s390x/syscall.tbl @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note # # System call table for s390 # diff --git a/linux-user/s390x/syscallhdr.sh b/linux-user/s390x/syscallhdr.sh index 85a99c48de..ac22d422b0 100755 --- a/linux-user/s390x/syscallhdr.sh +++ b/linux-user/s390x/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/linux-user/sh4/syscall.tbl b/linux-user/sh4/syscall.tbl index 0b91499ebd..d0f7cdb42c 100644 --- a/linux-user/sh4/syscall.tbl +++ b/linux-user/sh4/syscall.tbl @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note # # system call numbers and entry vectors for sh # diff --git a/linux-user/sh4/syscallhdr.sh b/linux-user/sh4/syscallhdr.sh index 080790556a..cb3a5de711 100644 --- a/linux-user/sh4/syscallhdr.sh +++ b/linux-user/sh4/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/linux-user/sparc/syscall.tbl b/linux-user/sparc/syscall.tbl index e34cc30ef2..5eb04edc9a 100644 --- a/linux-user/sparc/syscall.tbl +++ b/linux-user/sparc/syscall.tbl @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note # # system call numbers and entry vectors for sparc # diff --git a/linux-user/sparc/syscallhdr.sh b/linux-user/sparc/syscallhdr.sh index 34a99dc832..938a02bb48 100644 --- a/linux-user/sparc/syscallhdr.sh +++ b/linux-user/sparc/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/linux-user/x86_64/syscallhdr.sh b/linux-user/x86_64/syscallhdr.sh index 182be52a74..988256b6c6 100644 --- a/linux-user/x86_64/syscallhdr.sh +++ b/linux-user/x86_64/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/linux-user/xtensa/syscall.tbl b/linux-user/xtensa/syscall.tbl index fd2f30227d..2900f53c54 100644 --- a/linux-user/xtensa/syscall.tbl +++ b/linux-user/xtensa/syscall.tbl @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note +# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note # # system call numbers and entry vectors for xtensa # diff --git a/linux-user/xtensa/syscallhdr.sh b/linux-user/xtensa/syscallhdr.sh index eef0644c94..dc787fbbfe 100644 --- a/linux-user/xtensa/syscallhdr.sh +++ b/linux-user/xtensa/syscallhdr.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only in="$1" out="$2" diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 240923d509..fec83f53ed 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only use warnings; use strict;