From nobody Sun Nov 24 06:13:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1725969143; cv=none; d=zohomail.com; s=zohoarc; b=b9381E9l/wu0qIfCM/TBCY901MHH7S4YJB5dHmblq4UnSZKVcOVUkltGDkO2OcbrpcdCGy3HIqVNet1K/IQQXBhp8RNjB40I8uXQNkjAhz+yh9aUK5NSme0I/5iS/xKtvrxgmMDzmxWKvuc5cGPmDj56XdCqyA8dOmNOQIj5pD4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1725969143; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=jXVRH9YeP0ZiPm2lygL9nbSRmpHSfMI7+KyJVmSsa5o=; b=V/AJALwRpG08FwjlAn1qIryKbM5ueR+xLt2uI/IvXP5P3Ny/0LERyNTNvGkgKJcbAwul+r8kwdIkiiWQqsEDgRpfwGnqivNNo83l5oaimQGkr2AJc857cvzb0k8SLV7Mw/iQSgCc9swWHOBFA/yvu6wAlVFOStGq3IICraqXSoQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1725969143941978.7113846819584; Tue, 10 Sep 2024 04:52:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snzPi-0004Cl-IA; Tue, 10 Sep 2024 07:52: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 1snzPP-00044S-Uj for qemu-devel@nongnu.org; Tue, 10 Sep 2024 07:51:51 -0400 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1snzPM-0006Wj-IH for qemu-devel@nongnu.org; Tue, 10 Sep 2024 07:51:46 -0400 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-a8d56155f51so77327466b.2 for ; Tue, 10 Sep 2024 04:51:43 -0700 (PDT) Received: from m1x-phil.lan ([176.187.217.32]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8d25950cdcsm474155966b.58.2024.09.10.04.51.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Sep 2024 04:51:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725969102; x=1726573902; 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=jXVRH9YeP0ZiPm2lygL9nbSRmpHSfMI7+KyJVmSsa5o=; b=k20B9Ic2+PjXDq9gym96FkYd0llwBrvuVlwCBjcW6xIKhiaaJs2jLNWeqO9hGouCHb V8cD1gvRTAChtr1p0sqyBER4Hdmnx2e5SuUHSi6YV2jrGie3sLEZN4PlErIuXjZPU/9A pUYnT/zZS09mDwnkRLmyh8p+EXTJDWicvHLMy6BsmeAfn/V4r5CZ2L+QFhoqrgNCHNg+ 5lAxypdrqA8WZ+AZcsEwE35xqwUvFvaSQf8sBd1wyqv+4/qawwPYczvXbMP+nzja0I5S UuMPc1IwFpICYfnif+ru6i3BgSpa9OmvZjG5HZgDlcJ94PCWVmOXOSDAac0Wz7otC7IY OQcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725969102; x=1726573902; 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=jXVRH9YeP0ZiPm2lygL9nbSRmpHSfMI7+KyJVmSsa5o=; b=PZ3YArHfGaiLM+9asq3Ke+4BI25pUwVXJCtZaT2TsKID/hfJqJPrJu23JvbOVnVHpH vqGzQ5HZYMrtMRSGNaPWvJjxyvjIQj6DG2V/PFDriWUYywDVfhsO8smI7FJjL54GkiNV V4klB9wMBLvU9kOsxurf2UzFAYCyH/Fw/xB5HuMpr2jdC37LBsC+wKr+WIr0TprsmoTS BtPzjMp3agHNdWSdLwjZxAkrLFud7oCTsAAqIjX+wspJTwD+vu2TJAB+sf4hr6V28svr 2JjlutppqXyxLcVUfkjRH03hrsw3xrKEG7JVSAEr/OrByJa+IVJnaYk5ylCyZj9qknmn fgmA== X-Gm-Message-State: AOJu0Yw53dKMMnhu2SX7fGi79M/ORkFfgUoNtmFfu2hkYM0E5e/JLH+w ByCajUoCSk/ZyX5jNF+Wn6X4O9aBiGFi4YIwRrezGCfayRI4fFJt7l2w4Ri2OnuMV2ZKVRQk/pC M X-Google-Smtp-Source: AGHT+IHANiqzoDhLHXkZ+7YDJTBf9QB5nv+4ZFl+FghKC5mMc1hNExSS+O15VQg1lfHahdvDTYlmIw== X-Received: by 2002:a17:906:f5a4:b0:a7a:9ca6:528 with SMTP id a640c23a62f3a-a8ffaaad1d0mr44706766b.11.1725969101866; Tue, 10 Sep 2024 04:51:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Stefan Weil , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , Peter Maydell , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/5] NSIS: Simplify license description Date: Tue, 10 Sep 2024 13:51:27 +0200 Message-ID: <20240910115131.28766-2-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240910115131.28766-1-philmd@linaro.org> References: <20240910115131.28766-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=philmd@linaro.org; helo=mail-ej1-x635.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1725969145572116600 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=C3=A9 Reviewed-by: Richard Henderson 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 =20 ; NSIS_WIN32_MAKENSIS =20 --=20 2.45.2 From nobody Sun Nov 24 06:13:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1725969205; cv=none; d=zohomail.com; s=zohoarc; b=C9o1pTSKcG4IL47b8ac+dd18HasDJnZVi4JhJgpPH0wP9wbE483JyW9BynLzp9vrke+VCpdqjaa/xh2bXkaaWovTRSItgELY1x+palW8i+Mlf/zrlsgmGKQcz8iTVQgz/ZurKr5LkytuJs0PtXMJmKsr4OcUOEDzR+EIUIBsfmI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1725969205; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=S0tP38q2aXeMtCrKpnNgEUV5n804wzkdrcUKmPP1+h0=; b=Bw42zQmK34sMyhKJsZe66Y/j9t4cXCAexnmter0/jD/Zo9I0nnTfkAhn0VZ0o1E5l9m1uIRYyl4p7aqeq04V9pE9tumRW/gn9ddok2Zb0/EsAd+p20v9trYbzhw9RAsylZQLCr5yMeiSGY9me9DgjP4KICsKUBYT41bqHe+sw0g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1725969205828487.46446283490593; Tue, 10 Sep 2024 04:53:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snzPj-0004Ga-8H; Tue, 10 Sep 2024 07:52:07 -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 1snzPV-00045z-Mm for qemu-devel@nongnu.org; Tue, 10 Sep 2024 07:52:01 -0400 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1snzPT-0006Xr-F5 for qemu-devel@nongnu.org; Tue, 10 Sep 2024 07:51:53 -0400 Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-5c263118780so901110a12.2 for ; Tue, 10 Sep 2024 04:51:50 -0700 (PDT) Received: from m1x-phil.lan ([176.187.217.32]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c3ebd8cc33sm4188219a12.87.2024.09.10.04.51.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Sep 2024 04:51:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725969109; x=1726573909; 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=S0tP38q2aXeMtCrKpnNgEUV5n804wzkdrcUKmPP1+h0=; b=kSnLSsrUEFdPc6I9xKqoTH3UFAbmoOGg6/0qmx8B0sCbxlOq3LxgcQEPezDDL6RWX4 ph95tO6IDCDpPbcKty/8sgrM64YiL5HgSjkYKQfJwHCQHU1XKwQKDZCMqwfBF1JzSnET 5kUD9ekLsCGakPwu3MOTD8r0kxURtENbYN3lLj7Bukroine2EV5hxPUVs4ftlHWGSsKp qR9HTrGOuFJAMyZd0JGmMtul+6MNkJtA9XUC/R2pscAHHDra0UkFsBv3Q+vrW+n5N4lU 5wqzueLujSlJ1ZwVdTMqFSqRLf6akfHFIDXfeMHeKQz81K1dW3GmKLAMnl4Ptr46WAnK hdMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725969109; x=1726573909; 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=S0tP38q2aXeMtCrKpnNgEUV5n804wzkdrcUKmPP1+h0=; b=ErLyRjefuObG4fvRt4M3KpEcu+VgN2QEG8MmoprtS8MkZeYrgOmigMPPHvPuMPdUgs jL0K+7outKHXbusSt1NhpWl/Su+u9aRSYISa9StZoTwh5liIfVkoJmfYQpOy/4PlK18s eE5F4b4mUNOk+FoXFHtDxwRPMSfo8FHrKSQNMV4kpaEEsyEZXqxmI+Qo0Va6E7cg2edI Qninq3hB2DrCYzs2KBpXydy8U+Ltz4AzCQKC1Gjzh3BA4H27zJkf+o18a4O77Ubh3Mn1 ojdHnTeSRPYQMd0E1F7CAlAtGwLezEytcfOxeObbG0m6lhBfiX2ZiiGLkmquvf0b3qHt ma1w== X-Gm-Message-State: AOJu0YyMnNUnvEgc5QQoELKuUgEuJbxeY8EbxODsgPSVqTF//22mpmTr ATGnSyH1/fM31G52bWmR6/LW4vX6KzeN9ClnULeTtJldRNHpu5ed3Q94ldVdu+tzDXweHvEZtgK K X-Google-Smtp-Source: AGHT+IEzXBUCDbooUfQmm1Y7MsfG8eOhWmJ4LhAsjX0o+QtCoHa6colNT/ObDxaXfyjiD47WeQWfIw== X-Received: by 2002:a05:6402:448a:b0:5c2:632e:fad7 with SMTP id 4fb4d7f45d1cf-5c3dc7955famr10749585a12.15.1725969108435; Tue, 10 Sep 2024 04:51:48 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Stefan Weil , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , Peter Maydell , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/5] tests/functional: Correct typo in test_netdev_ethtool.py SPDX tag Date: Tue, 10 Sep 2024 13:51:28 +0200 Message-ID: <20240910115131.28766-3-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240910115131.28766-1-philmd@linaro.org> References: <20240910115131.28766-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52b; envelope-from=philmd@linaro.org; helo=mail-ed1-x52b.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1725969207556116600 Cc: Alex Benn=C3=A9e Fixes: 9f95111474 ("tests/avocado: re-factor igb test to avoid timeouts") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson 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/tes= t_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 =20 from unittest import skip from qemu_test import QemuSystemTest, Asset --=20 2.45.2 From nobody Sun Nov 24 06:13:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1725969144; cv=none; d=zohomail.com; s=zohoarc; b=g1UOTi8pfgOQIxRplC3HYsdmGDD14Is174VZ2DFB+9YcVPUCAVF7v81ApWhR3epwin+FyT+t37kyP7tAZTswvlUI/umuKKxt34vhk+2tXafyg0PXbv4EwU2PxG24ZBhhx8NMi/MgXcUvPD59+PLrFWvH6xDwTENDUhRPZCjjALM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1725969144; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+ZEFHfdoFuJdil5ozNrrm6kEBkj4W+e0/TKkIV2iBRM=; b=TIulyc0YU1zHvW2gXaUlDFBzXDRl0wUFc7SI2RaaTpJnJz0V7mnY0WQ8onBPSpE6724LG3jFTjjJc0zSgjqklFaLaQaY/ODQteB43Hr+9yxFV48a2StD+2M2zjBjZzHD4ABHarQGwBbQ+FIT9hLjufDG2wrQ2wieq9WyGvOGN1w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1725969144774705.5869386131608; Tue, 10 Sep 2024 04:52:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snzPk-0004Ko-9A; Tue, 10 Sep 2024 07:52:08 -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 1snzPf-00049Z-2e for qemu-devel@nongnu.org; Tue, 10 Sep 2024 07:52:05 -0400 Received: from mail-lf1-x12d.google.com ([2a00:1450:4864:20::12d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1snzPZ-0006Zg-IY for qemu-devel@nongnu.org; Tue, 10 Sep 2024 07:52:01 -0400 Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-5356bb55224so6337792e87.0 for ; Tue, 10 Sep 2024 04:51:57 -0700 (PDT) Received: from m1x-phil.lan ([176.187.217.32]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8d25c727a5sm478245666b.141.2024.09.10.04.51.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Sep 2024 04:51:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725969115; x=1726573915; 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=+ZEFHfdoFuJdil5ozNrrm6kEBkj4W+e0/TKkIV2iBRM=; b=q1jAivPidWNeONIrCNL4kuOmEwwRlHFciSZ9PGzbvcTPd73bm8Ohvl7Lb2b8UOkjju 5+EohLB+hJouB7V+wrGD4um5CumamuInShZQFob4sdpfZmPLR14gZPkDMbOBgcqpH2E/ i0j9JSZ/hLgWWS60YQtApLOGjfFOInDD8SPiwEc7UVe6zbohqjCKseX8VYxjxFoutvxU ggz/7qrdLESXhR9kL/OnvyYVXGaWIH9z+RP6Ogsv0oa1d8tJ1RW8d+JI9KnWMCEPMArc 1dcufLS0k0aZF99kZjb15WRQ01exj+1ULFs38nrIJvxbm3ZtGU45DZmSQwtXVXAu077O I4Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725969115; x=1726573915; 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=+ZEFHfdoFuJdil5ozNrrm6kEBkj4W+e0/TKkIV2iBRM=; b=IFZ7Q6saLZyKcHtb+ndZg0G8H3gPSzLG0zgvEdrXOtmEE2eIR5LAe5ErEnnaToVG7z eHueVBkSzIG6Nn5KpX2nC/cYOUdXqfewLywcZcqmvFN5evrH2JJnBF4jQOC/bqlW+nZo vMCukcQ/1eW10P8ocISNKvqz85XmJc76g47vhCdCokrxH2au2UsLFGQNsuvrP+/+fhE8 S6V6pyoh2Y/r1ub5FCdgYmPChjnVoUxrKaipifaRE6fzpByhdHwHWsIcEtzq18WydYSy oqLvsNNoo9NzI4pIFAafUY9JqEN4T71PL5Qm1HvQi7FIxLMx1zUMq5mElluRhQdsoQRb KdBQ== X-Gm-Message-State: AOJu0Yz3Xq7ESRWair0Yo/6gjItEdS35dpVD4vbS0Ep2rZay4694/Aw/ /ws8UdZhK3pHZBu1AmTRy4pdiIxYAXT64XPJ9GrOBUX4pJLj56JBTlgv8gYgiO4wdQBaxxtzRHw L X-Google-Smtp-Source: AGHT+IFrgdSOpCVqzP3YT7tQ09FilbjSG4RvtMsoQEw7MfC9e+QPmaBTHH7K7xUG5hjIN2hyTKnPEA== X-Received: by 2002:a05:6512:4028:b0:52c:d905:9645 with SMTP id 2adb3069b0e04-536587aaf0cmr8487141e87.13.1725969115099; Tue, 10 Sep 2024 04:51:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Stefan Weil , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , Peter Maydell , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 3/5] license: Update deprecated SPDX tag LGPL-2.0+ to LGPL-2.0-or-later Date: Tue, 10 Sep 2024 13:51:29 +0200 Message-ID: <20240910115131.28766-4-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240910115131.28766-1-philmd@linaro.org> References: <20240910115131.28766-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::12d; envelope-from=philmd@linaro.org; helo=mail-lf1-x12d.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1725969145574116600 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=C3=A9 Reviewed-by: Richard Henderson 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 */ =20 #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 */ =20 #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 */ =20 #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 */ =20 #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 */ =20 #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 */ =20 #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 */ =20 #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 */ =20 #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 */ =20 #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 */ =20 #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 */ =20 #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 */ =20 #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 */ =20 #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 */ =20 #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 */ =20 #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 */ =20 #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 */ =20 #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 */ =20 #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 */ =20 #include "qemu/osdep.h" --=20 2.45.2 From nobody Sun Nov 24 06:13:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1725969181; cv=none; d=zohomail.com; s=zohoarc; b=Dx6YqBhG2K6tOuaXygQvU29TsJw39QFSvc0+ALT1po/3C1qrDkgY4OvpHeXG2AkUo4Fp11i/1qnYWeF50TqR3MGwRehr67q1fO5ilPD2jD572+NpPvEuxsi69pHFNgM7yOCFSidtqz0lkXvkD0AHpeLgVAwGWRrdJk/ZybgJKpI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1725969181; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=q0NBguyBRzjLDeNAbNyinwyekBYn7oqEADIiej2ZBjc=; b=DUMuOZ4NS+jmCTiiJdNHg5bsB12PpJYaVhhSzxhch/0smaGyRzeGOVzNziEIJTLCVwKlb80+q8Qy3fWqHuYAYX1mTrN3xu1rNI+hYCE7LCbwgNp8z7mJvhLwrAlKeB1xM80eClPcuCpy6OK8903GiBV8A8sxbqJu3E/ZooE4JHA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1725969181594515.5470508565224; Tue, 10 Sep 2024 04:53:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snzPm-0004Sn-7K; Tue, 10 Sep 2024 07:52:10 -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 1snzPh-0004CJ-Nd for qemu-devel@nongnu.org; Tue, 10 Sep 2024 07:52:06 -0400 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1snzPf-0006a6-UY for qemu-devel@nongnu.org; Tue, 10 Sep 2024 07:52:05 -0400 Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-5c2561e8041so6298446a12.2 for ; Tue, 10 Sep 2024 04:52:03 -0700 (PDT) Received: from m1x-phil.lan ([176.187.217.32]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c3ebd8ce50sm4170171a12.84.2024.09.10.04.51.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Sep 2024 04:52:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725969121; x=1726573921; 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=q0NBguyBRzjLDeNAbNyinwyekBYn7oqEADIiej2ZBjc=; b=am4icO5nyaH19qtBeLqZo81VoPfzA9srv6+EzrSNXMtVl9tQP9JMFtx5e2vzW5DdJm SpB/qZiVZNc3B+4h74+jtf5V4GPTVvA11IzW8tI9sY/pgvxDIsKiYGCOsgB1svf5lh5B S/QlVOP0dhJCqtyrz+s8pRgBaRB2gxAZ8Lcqnyl+XhOBIKU9/DRwLfMhI/LgqEXUENNP Ae/p3mBRZ457VLa19+2Va6NYqofVTeix6ONAMlZ7wVuN0hpp9XdVQqPP3xnvatGggKr8 G9QdnSTAUrY3PTP5yOJS5KP5TdWA+0YnY5tePZctpwH/poN+wuDIRjs56LiEcuY6nbz+ EwwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725969121; x=1726573921; 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=q0NBguyBRzjLDeNAbNyinwyekBYn7oqEADIiej2ZBjc=; b=sIzhNw3WHzx02PVzj80Ewo6JGo0LRfqSdE3dafUHPOvlKvgsiyMG1sz7TcE+PUQYF9 qvgJaW1sN+xlD4ci90N/VtvKocbtNoKBGIaaoDVJByV9s1TlaxgsGq1rKlfj/LApMkof t1RlLyKffia3eo29mCYAI7uX2HUsfCEaCr3A4lvVuXw25XY2ihP80YIEEJt25C82rZVM yeCOhIShfcvJ5pO94O/tC4/zsAXbMyZ+AtElMr7kRZZDPmRrs7WnotTlrx5phuwucCkm 8IX+pKH3UuTTOuL/C7hAoil9uRM3tm0XoDPjLKn5jwLi9c0SwKQ/emoEo7H92zF+AsY8 JwJg== X-Gm-Message-State: AOJu0YyM4XJCvCwdMtrKYemxK30fyWKUcccHYzcz+skjgATBwxe1W1yr yEsVnzguX0Wl2OlI+sxb0+SMoN0C2MybLI1/amGDN4kmHGELrtZxwFgKSEC5ACiccbMpM8lv3cI Q X-Google-Smtp-Source: AGHT+IFLUtKgiVKjTAiiToMM74KSl9Xr4BFBYXuqh8ijHDkCvBTxxIk9yWMmFlszalBiPSNuLFc6SA== X-Received: by 2002:a05:6402:13d0:b0:5be:bcdf:4110 with SMTP id 4fb4d7f45d1cf-5c3e94d397fmr9406221a12.0.1725969121581; Tue, 10 Sep 2024 04:52:01 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Stefan Weil , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , Peter Maydell , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 4/5] license: Update deprecated SPDX tag GPL-2.0+ to GPL-2.0-or-later Date: Tue, 10 Sep 2024 13:51:30 +0200 Message-ID: <20240910115131.28766-5-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240910115131.28766-1-philmd@linaro.org> References: <20240910115131.28766-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=philmd@linaro.org; helo=mail-ed1-x536.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1725969183533116600 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 -l 'SPDX-License-Identifier: GPL-2.0+$') Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- 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 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 */ =20 #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 */ =20 #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 * --=20 2.45.2 From nobody Sun Nov 24 06:13:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1725969151; cv=none; d=zohomail.com; s=zohoarc; b=gPX4uqpGVMBqhsnQIGoIpxwjqZYXdDVv31VcQvwRypEftdF3JDfi8wJIgMt5L1aHSk8PGG8sA8m5v5esV/qLM0/BxDdsupToSEGMm/nDTcgIJliFFSx2GnC1CShnZgj+MSIDDo8aB8D0g1eFRm/S7m13HXtc+WWBXz3HTb3vvx0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1725969151; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=f4j7QaKPiMfal8LA98trbEZECyavoczk6GLxC++Oo1o=; b=OnjUkPrvt2JXMvGv5jxuRK4N8Iwkx3dn1VkEXXr9Nb9zMVnGh2+8f+55kxDsBf7J6CQ40ypCnQWgij0OSFBc6CVCL96wpac1m/Cz3IhjMNxdTi3JtrDQFQGtS8hrYdG3uASpyxdWfm1qThU9vaoCNjiBqpd3PS8mncUhNREkpmI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1725969151068232.19400226600408; Tue, 10 Sep 2024 04:52:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snzPs-00052V-EL; Tue, 10 Sep 2024 07:52:17 -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 1snzPp-0004mC-85 for qemu-devel@nongnu.org; Tue, 10 Sep 2024 07:52:13 -0400 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1snzPm-0006bA-4z for qemu-devel@nongnu.org; Tue, 10 Sep 2024 07:52:12 -0400 Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-a8d100e9ce0so511579066b.2 for ; Tue, 10 Sep 2024 04:52:09 -0700 (PDT) Received: from m1x-phil.lan ([176.187.217.32]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8d2582d490sm480271866b.14.2024.09.10.04.52.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Sep 2024 04:52:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725969128; x=1726573928; 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=f4j7QaKPiMfal8LA98trbEZECyavoczk6GLxC++Oo1o=; b=ItQUSk3smZrTjn5J0YK5I7Y3nFsFxh8gPvgzK0f+yZONnKKgvhL9UeEKQKKi2r+kX3 X1vATzqdmwrapv78zcR2on67bc+tpYzJyxice7DqeHDIkGbxvzjA0fg1l8uCdvdbZTLb nxQ6yS1v8EY0Gt4dlA+GN17+Nj7Ikonh9nX8EdVmMaUzSYNEhTPXAvtha6VrC8Q1k5g0 s0jgbDY1p9ZcuzdM6EEGIurWyAHJ1NefiaiYagR4MVQxAtDnUsUWbnW0huO9HQfbwX+h BEman7tEWUBnNSU0QH8eER4pQkRaK9mO+SItjMy22edwxlrXB3EC7kyRDsccTlkpAhIw vKXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725969128; x=1726573928; 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=f4j7QaKPiMfal8LA98trbEZECyavoczk6GLxC++Oo1o=; b=Sf1hc+PAOXnB0sk5F87J97mWySpUHRulSBYGBMDNt7LFwsbsjtT2SieFnWuPI1oIyO 0tgk0yGT76eFjgUOedOfIemZ1usELZ/891ozUqfVq+/EwqWAqZrTs42TEoZ3FXs+w0QL ZvKXWPLeMNLldq0DB7X81uOAwza8/wcJEgzqeyDbQ7uNm7mOEHhSo16r9i6zP9B3vuSG zyvUTxvuSY+N3k31GCXT09O33jjYDe+iZhSdvB3omMg6ilhNk5QIj7+rxAoOyOyPcnsm eErhqzb8NzdiDgHk68jMxiqP7rTXuogzKGAtGTN/fkzubY0kfTT/7NpBECNrG2OaLEAq cR6g== X-Gm-Message-State: AOJu0Yxc8jebxPpbZOKQsy9y+YjDwRh+RXOajC6gaVk0MdL5NdHMJU9X VxBbyeIP7gVgJBbVvAvjamPgVWjcTV+waKc825QPTtvdQISXKjpqSkmpajsV642OrrZAZNzlPbv x X-Google-Smtp-Source: AGHT+IH+1lAk76d8DtEULRk82XIVG5R8CiXx7tzfeoiF8hXBBUx/YsMmSBLeRJgr6ZRc6dlZW8VkQA== X-Received: by 2002:a17:907:2daa:b0:a8d:7210:e295 with SMTP id a640c23a62f3a-a8ffaaa245dmr46805966b.10.1725969128085; Tue, 10 Sep 2024 04:52:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Stefan Weil , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , Peter Maydell , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 5/5] license: Update deprecated SPDX tag GPL-2.0 to GPL-2.0-only Date: Tue, 10 Sep 2024 13:51:31 +0200 Message-ID: <20240910115131.28766-6-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240910115131.28766-1-philmd@linaro.org> References: <20240910115131.28766-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::634; envelope-from=philmd@linaro.org; helo=mail-ej1-x634.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1725969151523116600 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$') Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- include/qemu/crc-ccitt.h | 2 +- linux-user/alpha/syscallhdr.sh | 2 +- linux-user/arm/syscallhdr.sh | 2 +- linux-user/hppa/syscallhdr.sh | 2 +- linux-user/i386/syscallhdr.sh | 2 +- linux-user/m68k/syscallhdr.sh | 2 +- linux-user/microblaze/syscallhdr.sh | 2 +- linux-user/mips/syscallhdr.sh | 2 +- linux-user/mips64/syscallhdr.sh | 2 +- linux-user/ppc/syscallhdr.sh | 2 +- linux-user/s390x/syscallhdr.sh | 2 +- linux-user/sh4/syscallhdr.sh | 2 +- linux-user/sparc/syscallhdr.sh | 2 +- linux-user/x86_64/syscallhdr.sh | 2 +- linux-user/xtensa/syscallhdr.sh | 2 +- scripts/kernel-doc | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) 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 */ =20 #ifndef CRC_CCITT_H 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 =20 in=3D"$1" out=3D"$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 =20 in=3D"$1" out=3D"$2" 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 =20 in=3D"$1" out=3D"$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 =20 in=3D"$1" out=3D"$2" 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 =20 in=3D"$1" out=3D"$2" diff --git a/linux-user/microblaze/syscallhdr.sh b/linux-user/microblaze/sy= scallhdr.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 =20 in=3D"$1" out=3D"$2" 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 =20 in=3D"$1" out=3D"$2" 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 =20 in=3D"$1" out=3D"$2" 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 =20 in=3D"$1" out=3D"$2" 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 =20 in=3D"$1" out=3D"$2" 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 =20 in=3D"$1" out=3D"$2" 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 =20 in=3D"$1" out=3D"$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 =20 in=3D"$1" out=3D"$2" 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 =20 in=3D"$1" out=3D"$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 =20 use warnings; use strict; --=20 2.45.2