From patchwork Wed Sep 11 15:12:02 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: 827451 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp853632wrc; Wed, 11 Sep 2024 08:25:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVMpvrx4sMBF77i2WpJdZ/u8WDSVYG6+RleURNYmNqICuL2jUadPolrWVKslm1yaR8Aq0UbDw==@linaro.org X-Google-Smtp-Source: AGHT+IFp5HrxOw+muNIUQkhiqsjBt4rrQJ/nMDGobfTl40K8GBk/U4TJfgPqwgC7L4ezlKt3nnl1 X-Received: by 2002:a05:6214:5412:b0:6c3:5c39:45fb with SMTP id 6a1803df08f44-6c52850da2bmr219883786d6.49.1726068317843; Wed, 11 Sep 2024 08:25:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726068317; cv=none; d=google.com; s=arc-20240605; b=CA8+BusKsW6CJBzH/dRylEiqHzeRmmB8qCcIvjjVXrOu2vgYLR/TZsuz0560yUaNFk /BOPzDN09enLPa4HRmI+JDw8rqYdFHddcbr/QLEgh6vgrF09HedA97CTyAXS+9kpZDlU 77eqrZfTa5QnL3XfvJc6DHZe9t70cWnrHnlUj5VCyzGeZtFiIqDrFi0cCGyyXX+Zr3gH Oca6Dzn2X5u1QX6tOjbteHALoWsWLQ+xbjXHsBLffmSs8Q/ur56Yi22o6bkBoM6GvO9P IzmK9ttMycK/olv3ulsXE9SghXH4mNNNG5SCZ9UfLUdGTTPpuMqYwbeNwxX9i9WcRJyF zGjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=C6fs1IUTb9TPohRF9BBRWmVTfcqz5qZnUo2BPeCal4E=; fh=kcov7vl7xxOd84pcsL/vu8Npa8ekHQuOCdhbB2+Xkxw=; b=OrnoyhfiUXK/Hh5FfnHTQcDVsQqj9CnupirtSbL4awErqzJ8aJ1GrKnEjSUVyuPfk8 Vd7nqtdZfQsX0Ud4c63D/YHdboA79QwcEpj2DSxxLv9bteKHHDX6Nh9e2jQS72BeRQVn I86ctbtVlKBJuj4LDgyjKYSdjDnGucjSFkWi467FnVQqv1mOudquFTzYbiFXFJZG53VS UnWFoeJBl8EjpZC3A0kInScnMRWmeEctlftFEHDM3w0af0Mt7euNy3+TG5ZSvW8EgOqU VHDNQakY8Iy+LFtX1AHcIlMkaS6OaK6C9/OK3OG0APIDcsD3jKTT/+NwUQTblICo2upf 0UnQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=f8caxWHh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6c53433d3c2si106569626d6.140.2024.09.11.08.25.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Sep 2024 08:25:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=f8caxWHh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1soP21-0006PQ-1Z; Wed, 11 Sep 2024 11:13:21 -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 1soP18-0002u9-04 for qemu-devel@nongnu.org; Wed, 11 Sep 2024 11:12:28 -0400 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1soP0z-0001Hp-Ko for qemu-devel@nongnu.org; Wed, 11 Sep 2024 11:12:20 -0400 Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-a8d51a7d6f5so444260866b.2 for ; Wed, 11 Sep 2024 08:12:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726067535; x=1726672335; 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=C6fs1IUTb9TPohRF9BBRWmVTfcqz5qZnUo2BPeCal4E=; b=f8caxWHhJZiWO7x9aCSYJxqZOjGtYytgOrWhNGzWIvTVTC3yP0iO7+XgpFMdkGjxOY mDUn+TuLNxXPS6Sw1X5gpSqmxbQMd6m1ku6aus/jOj3AKKmldvtjrM6KDEIZeT/Xa/QN CORcRIa1jgZlFFOwv6zT6RB5XSLzZ0rIO261AVr6CUObbMya+h7d56Kfa7MkDqiF4Wtm L05pBv2r48fEOT1QERvmlspC08Ofo078Ag2B97NzIyEAlAUfvQz1ha9thRFHQfF/YRYM 2SoFqON8qS086BqJNaheQlijlRal6RT1IWfOJyVGQkA9Z2rUHpvHDOpyHLY5+f0AjeEw CK9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726067535; x=1726672335; 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=C6fs1IUTb9TPohRF9BBRWmVTfcqz5qZnUo2BPeCal4E=; b=X7vKdwBbI8WgqbKMd0D/Et30XSsKzMWeovqguOHf6vNDfNcsrRxAwe7bQ73EfJOSDu MuqEsi/SH0QTL9dr7lOkOrh3IKwSydUJJ2a+UdJu5jpMBi7e5Ha7a3RTW5Wclcio20B5 pFEc9Z/5EARXOS66Zuza02c4h4+V6OwtaGZm5EbpcXWnzfdOzbUDxEPqhd9ErWhww8LN xLl6ovl8gAW4ojllZv271gbul6oGg1RJmMXZM2LHwTcV/lB3zgyL/1sPcrGF6nlYP+4N 69GBmspEM7qBQdLaCm2mvYvVHEaDUDy4KAweLGlB4WKloQKJ8/FXQuPaeBqjg93eAxLZ 46ZA== X-Gm-Message-State: AOJu0YwDU9VB10Gbok0xYn1K4BQCvbEBNslgdMFzKyAHeV9U0OI616Hi 4tBmoECkSzgREsYhqW12GyFHeSO/JKysnE3FqDYIM3gwQGEN5W2Yewc3KQwiIyytQlwRU8N+c4R N X-Received: by 2002:a17:907:7294:b0:a86:96d1:d1f with SMTP id a640c23a62f3a-a8ffaadafdbmr488357866b.26.1726067535402; Wed, 11 Sep 2024 08:12:15 -0700 (PDT) Received: from m1x-phil.lan ([176.187.196.107]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8d258338a2sm626940566b.43.2024.09.11.08.12.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 11 Sep 2024 08:12:15 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org Subject: [PATCH v3 1/5] tests/functional: Correct typo in test_netdev_ethtool.py SPDX tag Date: Wed, 11 Sep 2024 17:12:02 +0200 Message-ID: <20240911151206.60368-2-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::62b; envelope-from=philmd@linaro.org; helo=mail-ej1-x62b.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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 Reviewed-by: Richard Henderson --- 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 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: 827447 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp849828wrc; Wed, 11 Sep 2024 08:17:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWl+TYuG30Z6rOiX+9a+TQA4h8MDkD3wvmyNKyiXSRbM2gyJLKw6Aeo8TIRG94gX+YmQOOR1w==@linaro.org X-Google-Smtp-Source: AGHT+IEvXBWvVxIYzX1FgXENhDRaQ+fTMY1Vu6seAty/OJz1DFUFlqLINLWSy0bemik3SHOEHezV X-Received: by 2002:a05:622a:1987:b0:458:2894:984e with SMTP id d75a77b69052e-45828949d17mr178423741cf.3.1726067827997; Wed, 11 Sep 2024 08:17:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726067827; cv=none; d=google.com; s=arc-20240605; b=No4g3b2J8FYVRGq+mLwqZ5wXewu59UlITNK5eIfaxVsitZtE0a5jtWMHFTAAVe6ZNK O3YJBp4l6LzKRvbUmbJ3uYf5kyl7m+5P3WdVLTDHfOsWHeU7C+p76wEW8l8qATHbjr3n escTFIX/K+QqBBFvXH3hLbH695NdurqakBNG7ixkaguQInt7JJnpiG1uMmTFZ0+jd3xw DjqNTaOnoqx8UyxeYofdRKIX/EY89x49xDI6cpk9rtVda6QAAN4N68SfrM31jX60Qvvf r7lS9yZf3Yuoz80c7VVt4DzcHP9eV53b+AD7qIo5umKyLPmq6ChV7hf/pqWc4fVOimN2 fLeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=f52+BqOoRzSG9eBiMUrGEFVsDTdb6hL4k2FLSWDqtKs=; fh=kcov7vl7xxOd84pcsL/vu8Npa8ekHQuOCdhbB2+Xkxw=; b=L9MVWHeGsvEFfSkxSvVMZTwDKgm/ohtqFpdmvfn2lBu511nu0A7GsHcwPXNn1Kp7q7 fu+kWfyVLuYlf9U7AinPlhXXTLQe8wgkRlJp1Mg2//j5Rg3e5t3CoGutijMYiZf1GTfe uGaGLsCMDyYCc5Zxaj2fEtQ7l9M5umhSxiI2ZLDOU2If7Yyq5lwI+Flslbftbcs87bKl BUbZXqe7+f3DfuL9K2FTBO53wSiE8dMCK9Hc9GDvvDLvz6AXwpB7w5h3BwyRudtIkP3O 9KJyUhqCo/JaaIQBFkSBcuSGZvVyzoqDPHg6sbpS7yg0jTgsyiut4EwZZMuyZNjhriG6 KmPw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bDJnhHIF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-45822f82752si99632481cf.513.2024.09.11.08.17.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Sep 2024 08:17:07 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bDJnhHIF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org 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-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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 From patchwork Wed Sep 11 15:12:04 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: 827446 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp849628wrc; Wed, 11 Sep 2024 08:16:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX1yAmUPNCZwKkCCxrQb60XVAfYq1j2/8v+N3pjyTJGlp933zWHLuT2yJVNPtHkkgq1DiG2tw==@linaro.org X-Google-Smtp-Source: AGHT+IHZTUYvfQ8FnvyceRSamLLBoiUWPtxFlddQWRRQEl7Yo56yOLdG3Dj/5QU59rpTFQIJpeNW X-Received: by 2002:a05:6214:468d:b0:6c5:1337:e287 with SMTP id 6a1803df08f44-6c52850e99amr362860846d6.33.1726067807274; Wed, 11 Sep 2024 08:16:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726067807; cv=none; d=google.com; s=arc-20240605; b=M6uuwITweUu6RaWqtRrLA9QzH6VB2rfsMefqOpHwIlychq1frDUbrarZWTiFGWObBk h2CfSO7shIE9HUdcXYtI/nHhL/86Z7pUsp3kVPupa7SrxlFiurnDvES8s2Rp2BxOFbjB y2QxUcQsFQXMyujEMzm1dY6VjuyhyxFEcpAD83HXDg77bbtlISPQTKJvC5ajP06wdLyU jJA4859H2zPI6eA30wRkpqctOsWoOa3zhRsG2Wwp6Hl6NATgGMiMtAgsysI1+EsmpWgr HICdJKIzHkTxBol33xlGn3sKOeu9t8dY7u3j5kWgiHn6osVYQNSy/mjr4cAq037pPUsm rXlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=SUs0kQTHYShzT3bcv8mwq67EYJLTHk6x1ciaWG3e2bs=; fh=kcov7vl7xxOd84pcsL/vu8Npa8ekHQuOCdhbB2+Xkxw=; b=jPeuJR4/32DoXCjHa8I40aIij2oDI/EINvsmJWzco71AP4RRyGhrm/aBQjtQklNee2 wMiNNE4FO+ZRtDOv0d0tQ9ASDIrE9Jl2/46W43EbuhBJ3j0CKMBmMaCPa3wYdF0vxNXe cxsfEowBchmLPcdXpIBKR8CNdpr1DMMWNjqeU5GPGg0s9kO1vWw8vBc2bItwjsnMabTh iSK3NZZdFiPrdrirO+hESuv+2LNxQMurKmG31DTJ9QRcgk4l7DCBJBxqVeAClbiKgx25 W9NvuseD+WCdEDJWp0f4z+/d8eqYvALYuLVXdO00zQBlYlbaI0zojZiz1gDQLTKDGHAc zPLA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=v9JB1gaU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6c5348c9c1csi107270586d6.587.2024.09.11.08.16.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Sep 2024 08:16:47 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=v9JB1gaU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1soP2O-0008G6-Qj; Wed, 11 Sep 2024 11:13:45 -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 1soP1E-0003Mk-4l for qemu-devel@nongnu.org; Wed, 11 Sep 2024 11:12:32 -0400 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1soP1B-0001Ir-Dd for qemu-devel@nongnu.org; Wed, 11 Sep 2024 11:12:31 -0400 Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-a7a843bef98so551052466b.2 for ; Wed, 11 Sep 2024 08:12:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726067547; x=1726672347; 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=SUs0kQTHYShzT3bcv8mwq67EYJLTHk6x1ciaWG3e2bs=; b=v9JB1gaUXkRnSSglDadiVTTPFsQdqXOWga4blH2PMLC6IZQiD6AZHdN75pZlpZiEhK eO7o7BHxWb+W1KmF+u72C3K7woDgSx+3iDmyXOwYSIZ/DYPP+qGR9EKPwpDbJ5F4Yhxd 3kDPfbtqU9UXquMmvy6pwGT3PKn5w9F2QAc8e/qIpwR/ZHKui4+NKoV+OXZJKuXIWukG Wg9P5SvvZbJsykcDpZ/62+QoWzWWe2lJIrfrdqEQrCjbmhG8zuShCrr9XEGFw0U1yJu9 edZj4G6TOURWeGZSIejP/4ibqzymBX50g2IipVvQ6OvwTAtUGAiuTVB6jzD6p7c8oM2M VxyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726067547; x=1726672347; 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=SUs0kQTHYShzT3bcv8mwq67EYJLTHk6x1ciaWG3e2bs=; b=v71N1vb/vclIq9bxJirTdVEsand+F0CCL2wfU6ZaRayUPYuagd1MwFrjkcXCsg1YWm azyk7XZRNCyycs2q1KKt/SvLwAQ220Aef+lYjnX+gQSPOwwa6iSneXEZnr8DM4fV46li POaH2dLfm4Zg/fYqi4Dfz1wqcDllv/Vmi2IO3vX692CRpQJbikajWkYJjMs+MavlE6Q9 cXxn8GC6pAzmE8MYSHR7F2IaMpy1FzWrGtwBiSlwEuMgyhkpScagfZv7Rnq1vxnymj5M 5ShyaifpmI6JFLh3DuM8JsDUzFdXlRsklXmn+wnEpuEDP4esACE3TENxGFwV9cmPgzLJ bwUw== X-Gm-Message-State: AOJu0Yy9NafnrUuI5yFKoVjZ+ZwJsT/4iRXMT+QtmFLFdU2tYqEIKz7v 2AjvThMZKHqSud1LPT+346YbJPSLg6qTuRYrZTw9byKt0DosD8WzsXxgfVXepIW5dcasDwom1Ox M X-Received: by 2002:a17:906:dc91:b0:a8d:401b:db85 with SMTP id a640c23a62f3a-a8ffab944a3mr391658066b.36.1726067547186; Wed, 11 Sep 2024 08:12:27 -0700 (PDT) Received: from m1x-phil.lan ([176.187.196.107]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8d25d657fesm627207966b.221.2024.09.11.08.12.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 11 Sep 2024 08:12:26 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org Subject: [PATCH v3 3/5] license: Update deprecated SPDX tag LGPL-2.0+ to LGPL-2.0-or-later Date: Wed, 11 Sep 2024 17:12:04 +0200 Message-ID: <20240911151206.60368-4-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::631; envelope-from=philmd@linaro.org; helo=mail-ej1-x631.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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 Reviewed-by: Richard Henderson --- 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 Wed Sep 11 15:12:05 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: 827449 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp852458wrc; Wed, 11 Sep 2024 08:22:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXBFYwybAHMTCWAd3Uk4p0Vl67bv2lhT3uDInSEwdu8GUHgsv7vJR92H/PT4NozaDwlXyndXA==@linaro.org X-Google-Smtp-Source: AGHT+IHfX3rShXE0vl27i1M7yJMKaRqmdkIs/nrEjH40FTBudKgLlrIMpLDXmsLgqYbjiLUawSKG X-Received: by 2002:a05:6358:7254:b0:1b8:203b:db89 with SMTP id e5c5f4694b2df-1b84d0e5f0amr542168155d.5.1726068161514; Wed, 11 Sep 2024 08:22:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726068161; cv=none; d=google.com; s=arc-20240605; b=EAM5CSvm8JlDVRcJIkYdszJUD00CeFDEvtvPck++cpm+79g9A1ojr7mJvMOjvGdK5/ FIaNodFx5bzspGYbnQ6dbdEbdZMHft5BjhW9X2uTNujDEk4BYiMMcb5m1dJmKwPG0jb1 8U9HGsPMkuxCFDIggrvBGwPCHq1MEB/Pmzd3AEI0Uo8cnUCUIcLXl3kf1qQSDgROqV6Y MbdYT3RLW7RhzHkLu1YsHagom+DS3oyBMDmRcMnaaDU31YR+DyoRFzjKuMA7Iwnj90zZ DqMNQvG0Kx3MrWQ2vVLPJTKW+dW+bkd8BpRLdT4BwyRaGOyv2WprLkcAAqWnPU765luY JuYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RnEXofH39QOzGuHkMNSmPSGC7FdtUJnuQkfgBew8Hmo=; fh=kcov7vl7xxOd84pcsL/vu8Npa8ekHQuOCdhbB2+Xkxw=; b=YxqyMK8NU0soFk5myf0EfhBU9jvTQ46L5e71KrBpTk0m2MtTrIfNMlkdrETY76TkBb 5XnfadgarPFDlXNglvSjaStR/MKrKKGJdoRpL5EDXcVb9iKvS8onTS7kBiGbU918Ops+ pD8x+2tyF++Lxdr1/Nmj83irNRXSclg/MG1GtQqES775rxSjTPkhpOVXDlMhB18zbtvD isuhYwmhhuMzvwFQxM5TYrChtqpJ47Z+t040+DOA/sUvrxK4+rR451B17HUcM/B0qP9C CCknnnSizBfwrAml3bEVPaWFbjJQAW0gZ1B6Z8+Gy73E9aR2R64j0hf+vuUU6y5FjNst XLQw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ad0jAWSa; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7a9a7a37691si1043078085a.357.2024.09.11.08.22.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Sep 2024 08:22:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ad0jAWSa; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1soP3K-0003ri-FS; Wed, 11 Sep 2024 11:14:47 -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 1soP1J-0003gl-MV for qemu-devel@nongnu.org; Wed, 11 Sep 2024 11:12:44 -0400 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1soP1H-0001Jz-1e for qemu-devel@nongnu.org; Wed, 11 Sep 2024 11:12:37 -0400 Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-a8d6d0fe021so466236766b.1 for ; Wed, 11 Sep 2024 08:12:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726067553; x=1726672353; 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=RnEXofH39QOzGuHkMNSmPSGC7FdtUJnuQkfgBew8Hmo=; b=ad0jAWSaIy+wC9VaW8KbeWayvvHqsN0/KTX5x9Jsqh6aVIzN0OkXqfv7fVTI7OWroG jj2qCVSVMcLiQCj1jGatGp5DyQnMbL92uqKYsBrxYQGolS/N2QfPULV4XZ/ZwPG+X55I 3sXDzyXvVEYbhtuQxoVmw+c7iseB3fmT0zSd1oaGi3lbPF7/hzQsONBpMkvud8KkzDk5 /2GGF2hYBTsvEygttK7DRGDR1q3WR+sP7Hw7Ho4epM7jSM04sCA4WJPfSzUx5THPUpSe lXqUgBpXeFZFNhYbQy7uFj4Bu0bxa00OGEigze6g/d42YEXYNjbRNV7OeJED9dTh7BWC /nfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726067553; x=1726672353; 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=RnEXofH39QOzGuHkMNSmPSGC7FdtUJnuQkfgBew8Hmo=; b=jikxtt34w3ra0PuOCo0ZuHK51CZY5IEodd4xSKk6ZmT9ZPI0GlLp4O3BASFNCZaHkU Liv0OvHRTEu/6ggEyYiiarPEvI/FCY/8lUItQIBKJ+c4CreUrpoXciwl0mv2WC7FnmYQ 8T9bglHWrBn38GT+UiCCRVf8GFQvqnOiCJfNrytCAFJIKPrsBgcStB+P7RkFDmwR8Ans PPPM4ynJuCtLZOB3yCMULSjexqJLwLualEjCRngYgUttEwUp4puS/4AI9tutU3mwTFep zFCQn1gvNxjGWiP9F8EVpRm1HmmWfrG5yhV23MCDmjWUqBdLA5DVgwtqI3WzxGUdivjZ Fq9g== X-Gm-Message-State: AOJu0Yy/D+eHeG00xul/hQLMDYkIuELRS/ZIgxfpWaQHBGoUdQtmxbB+ dabUro8bdlIONfL7DB4HQME9yRzxodb9dYxawzwnsGlmJQII7T0Al7/zW8IN1jEB9phXM1uKv8M L X-Received: by 2002:a17:906:d552:b0:a8d:555f:eed1 with SMTP id a640c23a62f3a-a8ffab6d5f6mr466952166b.31.1726067552890; Wed, 11 Sep 2024 08:12:32 -0700 (PDT) Received: from m1x-phil.lan ([176.187.196.107]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8d25835a76sm625728966b.39.2024.09.11.08.12.31 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 11 Sep 2024 08:12:32 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org Subject: [PATCH v3 4/5] license: Update deprecated SPDX tag GPL-2.0+ to GPL-2.0-or-later Date: Wed, 11 Sep 2024 17:12:05 +0200 Message-ID: <20240911151206.60368-5-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::62f; envelope-from=philmd@linaro.org; helo=mail-ej1-x62f.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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 Reviewed-by: Richard Henderson --- 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 Wed Sep 11 15:12:06 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: 827448 Delivered-To: patch@linaro.org Received: by 2002:adf:ab1c:0:b0:367:895a:4699 with SMTP id q28csp851936wrc; Wed, 11 Sep 2024 08:21:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVF6DzckdHFtqCpEGharzclXQdsZOHECJ1EOlkJE9TT974yiBxIq47UuEEzoUynd8HaL4Kf3A==@linaro.org X-Google-Smtp-Source: AGHT+IHyYvp/i5DnATKLSx9J9dDIa+sBr+F6dKFofrE+EcVloDPUwhNnP3VWElwhzSK14eMwwr2i X-Received: by 2002:a05:6358:708:b0:1b8:4cdf:5ac2 with SMTP id e5c5f4694b2df-1b84d19dc18mr639549955d.15.1726068089443; Wed, 11 Sep 2024 08:21:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726068089; cv=none; d=google.com; s=arc-20240605; b=fJ1F1apZt6zVdrk56byl936zTMKHF5AmY5DXg0w+D+eCzz8wOurlvhk+NXQOyvWQ6Y Tid14w0EOUw5VuG3JDuDyXthxrE14H0Dt7QbMuPDruE3j3zNCP4grDvoBvX/4/gJa77U fgab0hf6jdRp17drPaktjGFjnSVVufUV5Ea7oTQucL5bwIhYrlZEg1tSvI/pU0XoCy7g Tj4hFYg7ObshsKZJhtWtPUYGb5W8Oh7oVudQqT8WvVczjLk099rRQuZ9eEjHCWihTom0 5Y6ZEqokIu0Y6l6aEVcECKklTlGAhTIwx757M7hAssK8C+W4Lxkv0SH8PtXcMOYN8Dpp 0T8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=EB6WE0Md5naMBpceBvItyS6hBeXESBfSCn2OSsVLoDw=; fh=kcov7vl7xxOd84pcsL/vu8Npa8ekHQuOCdhbB2+Xkxw=; b=BACmvyzGi+OA2zEyi/+xZGZpLbfZh/9NjPjBnzuj77fWNEEgstbnvQH++F7vAwvT6e Wi01HQKFkzizDu2GpFEKVZ1wqjA5mcFoV4CdIuluB47slTU1htOXeQ0KzItUzhubF9ac LdgjNCRu49qavgoCvqE5iRTaqMKvLU5oMUcJ5m74B3HCdPPV5bLVp2gjShEs7wo7TqOZ drhkXEuivUqxDG9pP/oejw03CJpqW+e5B29n5rU2mdWDdp94BaksY0JUrVTTVuvKdFBq 4fZrOaB/3CDRhWEW76ljjccCp47x0X4vQ0gNYHT1DD2HCFxm+Wt3mtNc1WBSSslQnxkr gXaA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="P6B/jGPt"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7a9acd0cbdesi963952785a.681.2024.09.11.08.21.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Sep 2024 08:21:29 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="P6B/jGPt"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1soP2n-0001cU-IG; Wed, 11 Sep 2024 11:14: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 1soP1S-0004Fd-JE for qemu-devel@nongnu.org; Wed, 11 Sep 2024 11:12:51 -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 1soP1N-0001Kk-Rr for qemu-devel@nongnu.org; Wed, 11 Sep 2024 11:12:46 -0400 Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-a86e9db75b9so300368466b.1 for ; Wed, 11 Sep 2024 08:12:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1726067560; x=1726672360; 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=EB6WE0Md5naMBpceBvItyS6hBeXESBfSCn2OSsVLoDw=; b=P6B/jGPtlA0lUiIwOxzuxnChDKwjk8yBnPK6ALqDo2pCNNuHsessNQqbMD9jVbZLxg eMrj8zzE0Y+qERdnTm2JXHTWiRyKG2/LM6jmVLdjhkZaAj66IxPT+4UVSH2h5h2rxTGj 2s1Y8OyraX8jJBoB+ZvYokxUr1kVJDWTL9lKCW3n9Eq2Xs5DXgw5TvbUo2WS5NrWGRFF svXsWYPnSCNAGHVEg2ui0jOhXoT4YG/3N7H4sgkzncbuxehnDuAUlC1TB8fhGHH80FzI 4cYYIZB+148KOngow4slAHgo54crnU7Jar7640YyY96JTnMmWP+j5zHmec4iLIZPSsKU 2y1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726067560; x=1726672360; 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=EB6WE0Md5naMBpceBvItyS6hBeXESBfSCn2OSsVLoDw=; b=pYSZOwQd8F3kFFUXriLcCqQWe4VeD5J5XITtfWF1j2gVgXJ/IoMHFFnqVa17m8ZY9W 9ESgSw6OCA9m560VDXR4SQrJIniMz5L00ATeCsNCz44TBEwCKNSeljSDPdUy6823lqbY +ln1r7UTmbBLhld5wTHa4Dryy78b5jMtnMnnPvt8wiF1kA6ePyRvXcrp+cyujiuB2Tir YRn/fkqKI5xuAVChKrnLxhFSsA2/0++bW0aSVMtu8/YXcBb1rnMNFBMiMaIUgGCzCS+J cHFEZu6QCtds/ewsa1wK5skQ5hSLXqpErucwKpj+/eI3u7uzbXSBGR4cUar0vE9yuYJj l7wA== X-Gm-Message-State: AOJu0YzUMn76gG4mbKVGpJHIND8DC6fZNR+e1V7S1HZbLaEz66wkrDVf 3n1zJ5hjIsxYmE+jp3xUr1cSQl+p2JfD74l3Sk/5BI8M6ToJuT0IbmpIRir7T+PPzo+t3kQMd9S + X-Received: by 2002:a17:906:4fca:b0:a8d:28dc:9e2b with SMTP id a640c23a62f3a-a9004a66ac2mr349831766b.44.1726067559917; Wed, 11 Sep 2024 08:12:39 -0700 (PDT) Received: from m1x-phil.lan ([176.187.196.107]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8d25835ad4sm623928466b.21.2024.09.11.08.12.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 11 Sep 2024 08:12:38 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org Subject: [PATCH v3 5/5] license: Update deprecated SPDX tag GPL-2.0 to GPL-2.0-only Date: Wed, 11 Sep 2024 17:12:06 +0200 Message-ID: <20240911151206.60368-6-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::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=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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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 Reviewed-by: Richard Henderson --- 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;