From patchwork Wed Sep 11 15:12:03 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: 13800811 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 18020EE49BC for ; Wed, 11 Sep 2024 15:17:08 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1soP1h-0004YX-M6; Wed, 11 Sep 2024 11:13: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 1soP1B-0003BU-Mk for qemu-devel@nongnu.org; Wed, 11 Sep 2024 11:12:32 -0400 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1soP17-0001IM-PP for qemu-devel@nongnu.org; Wed, 11 Sep 2024 11:12:28 -0400 Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-5c412cfc53eso393395a12.2 for ; Wed, 11 Sep 2024 08:12:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726067541; x=1726672341; 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=f52+BqOoRzSG9eBiMUrGEFVsDTdb6hL4k2FLSWDqtKs=; b=bDJnhHIFDEdeyBo85iznVQqhDm6vh302SdYd3TcCnQvtqvbYXo5JA0t9k+hvT324yq Rd9mFLCJwywo4MCJcB+w7wbuFcnVYOEmaz4X36jtLUNzektYbhIJ65GITlvU2ci98OM2 zSgMgmEQTCl4a/GeHFFFZrncO/mqZRuwlb3U/kQyps1IWpLllzw6YXQTRX06SZdCeFOO SYZpvCy+khzIQNidy9ztXUkyxd/h6rQz8PwxS+erJp1i0OdAgtqWhFtpABTH9WynZxoS ocwiBveebf2jXZLMEys7RIDsl8KNWJOTd91Vik/mVvPdYF1wvAg7coG0RHtYiwBTGf67 fDcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726067541; x=1726672341; 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=f52+BqOoRzSG9eBiMUrGEFVsDTdb6hL4k2FLSWDqtKs=; b=lbPHTETI4DAv8ZiSALV/Zn/e+2Khi76+nJ8Se1uTsK7ocnFZwz55kVTPfaeiKbd4je C1qtKiAV5gltTwuUxR1cb7ppm81a9+oa6n5wvHOcU9b8qU71ITH3I2giIjH+u2cqhP9O jxq0XzlrvucZ6dsnpae+a/uJ1GAD5pKG0ItYGF+g7oa+jVrXTeAGb7qJvOQNq2FKu5gw r1XU+Kzp5gopbT93mN6vDEGesmZH9l1aKq55MDCEGE6mTKkWLWjY00IDlQvt1QXyH3gd 49OG57Kl09W355qTreHjKdFtDP64vFIDiD8oMdWOB9QOAPkb6t5g9ClkKOKfKLbjTJyt vzOw== X-Gm-Message-State: AOJu0YyVbg5EVo7SV7MEMgRZXAxDtkM6O9/pLMGxcR7uGJ8uYy7aBFTc CNwSQ+c5b34LxtfkWtm/Pds+Ztbw7nSBK2McxDi7wdqHNP53M3budWMtLaQdS5E8g2RMhxNw6yC 5 X-Google-Smtp-Source: AGHT+IHlWRcW+YSCOoeARjmOWmlsXZUiXq4ysmZrs1FNtCBGBF1ufs5ezV0SUsNbR7wwXx2+iLk3nw== X-Received: by 2002:a05:6402:848:b0:5c4:1334:76ea with SMTP id 4fb4d7f45d1cf-5c4133476f6mr308265a12.22.1726067541207; Wed, 11 Sep 2024 08:12:21 -0700 (PDT) Received: from m1x-phil.lan ([176.187.196.107]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c3ebd76eb6sm5497102a12.61.2024.09.11.08.12.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 11 Sep 2024 08:12:20 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org Subject: [PATCH v3 2/5] license: Simplify GPL-2.0-or-later license descriptions Date: Wed, 11 Sep 2024 17:12:03 +0200 Message-ID: <20240911151206.60368-3-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240911151206.60368-1-philmd@linaro.org> References: <20240911151206.60368-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::535; envelope-from=philmd@linaro.org; helo=mail-ed1-x535.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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. Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- include/qemu/timed-average.h | 4 +++- block/vdi.c | 4 +++- hw/net/eepro100.c | 4 +++- hw/ppc/rs6000_mc.c | 4 +++- util/timed-average.c | 4 +++- qemu.nsi | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/include/qemu/timed-average.h b/include/qemu/timed-average.h index 08245e7a10..dfd8d653fa 100644 --- a/include/qemu/timed-average.h +++ b/include/qemu/timed-average.h @@ -8,10 +8,12 @@ * Benoît Canet * Alberto Garcia * + * SPDX-License-Identifier: GPL-2.0-or-later + * * 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 diff --git a/block/vdi.c b/block/vdi.c index 6363da08ce..149e15c831 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -3,10 +3,12 @@ * * Copyright (c) 2009, 2012 Stefan Weil * + * SPDX-License-Identifier: GPL-2.0-or-later + * * 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 diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index d9a70c4544..c8a88b9813 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -6,10 +6,12 @@ * Portions of the code are copies from grub / etherboot eepro100.c * and linux e100.c. * + * SPDX-License-Identifier: GPL-2.0-or-later + * * 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 diff --git a/hw/ppc/rs6000_mc.c b/hw/ppc/rs6000_mc.c index e6ec4b4c40..07b0b664d9 100644 --- a/hw/ppc/rs6000_mc.c +++ b/hw/ppc/rs6000_mc.c @@ -3,10 +3,12 @@ * * Copyright (c) 2017 Hervé Poussineau * + * SPDX-License-Identifier: GPL-2.0-or-later + * * 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 diff --git a/util/timed-average.c b/util/timed-average.c index 2b49d532ce..5b5c22afd8 100644 --- a/util/timed-average.c +++ b/util/timed-average.c @@ -8,10 +8,12 @@ * Benoît Canet * Alberto Garcia * + * SPDX-License-Identifier: GPL-2.0-or-later + * * 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 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