From patchwork Wed Apr 10 07:21:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 787478 Delivered-To: patch@linaro.org Received: by 2002:adf:fdd2:0:b0:346:15ad:a2a with SMTP id i18csp567289wrs; Wed, 10 Apr 2024 00:27:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV/nrR83DafvaZTE2hHqXOunchmOSUkAhcV30rBK/j6QIxadJlYSuOdf7y8mGyJy8HgIDbjw80AcjjlHYHlVUne X-Google-Smtp-Source: AGHT+IE+fUzhiOELC9fBT7TgvZD0kECPptlMiDRwb+TLs6/5HYGSkk3cr84/tRIOwyp2d/5jrEQ4 X-Received: by 2002:a05:622a:c:b0:434:7189:d688 with SMTP id x12-20020a05622a000c00b004347189d688mr1858651qtw.30.1712734031562; Wed, 10 Apr 2024 00:27:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712734031; cv=none; d=google.com; s=arc-20160816; b=LTXbHJhTqh4w4+bsYClGvgRFUF4z4AUkoVK1EO5rpfPVJLawciyWU+9YJZqpaKeajB eJ6lAUiRz0RQhIMB220lbsG4rcEgsg7vy11o5Voo0s2vZOT4AAj/gOp05Q+sYV2PfT54 vycj0atuNAq2UCD3FKU5nrEP2bLLnB5iXFLGIMtddgGTHOxz+uetPozcJyjDFuKo4VvY prj7WGamNnwM5FTVCQMEJ9btB0a2HdHSMD1SbGJCDhZXM7c9YScgx0azNsoHp6iyOAYv PpuGDG+wcm+xJISgt+YqO0MqoiByj3G3rWNeCGyddki7M++Aa79Cglaq3fDnSiTUccA3 aolg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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; bh=XR+m1dQrH0I5wbuIwUeSbyTx3KNYRKvhnpmkUDfbAcA=; fh=WSH+rgb8zHsSS970+IbWuJr+MBuQH0/X3ZsBvbo2Kvg=; b=QLY/XLiWkeTi15mcUSrDeH/biUG7sVt5Bb4e/tRbAKDApuHped4nW7KEm8/YjOwXLa v+6Ml5sIJt1F7ixCSbrp7hI1+elwNqJ/eU33We4pljXCM4kBYxwH8/Ou7TXW173jBdYs acx3MdXnK6PN9F1IP+Phs7dhnKIaQvHL2dWpHfS9+59/0qR28E51ugd69DzjZIt7ds66 Y3Mov6zQ7rUsgnkxqeGf/05fGeSnMd/UW/zFc2yb4r/3CLR9DYKrWILfKAXeoSjYIqEP h+PSEPu+vStRly64h1BlBR7O0urw/1xwIH9gtde9Bo3w/VuNkUBDxHrGqU2uHctDD2PE f6wA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w8-20020ac857c8000000b004315e4f196asi12243535qta.664.2024.04.10.00.27.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Apr 2024 00:27:11 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ruSIy-0007vU-EC; Wed, 10 Apr 2024 03:23:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ruSIp-0007aM-E5; Wed, 10 Apr 2024 03:23:27 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ruSIm-0003ub-RB; Wed, 10 Apr 2024 03:23:27 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id E66FE5D677; Wed, 10 Apr 2024 10:25:02 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 84D19B02B8; Wed, 10 Apr 2024 10:23:04 +0300 (MSK) Received: (nullmailer pid 4191668 invoked by uid 1000); Wed, 10 Apr 2024 07:23:04 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Peter Maydell , Paolo Bonzini , Artyom Tarasenko , Markus Armbruster , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , =?utf-8?q?Daniel_P_=2E_B?= =?utf-8?q?errang=C3=A9?= , Michael Tokarev Subject: [Stable-8.2.3 08/87] hw/rtc/sun4v-rtc: Relicense to GPLv2-or-later Date: Wed, 10 Apr 2024 10:21:41 +0300 Message-Id: <20240410072303.4191455-8-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Peter Maydell The sun4v RTC device model added under commit a0e893039cf2ce0 in 2016 was unfortunately added with a license of GPL-v3-or-later, which is not compatible with other QEMU code which has a GPL-v2-only license. Relicense the code in the .c and the .h file to GPL-v2-or-later, to make it compatible with the rest of QEMU. Cc: qemu-stable@nongnu.org Signed-off-by: Peter Maydell Signed-off-by: Paolo Bonzini (for Red Hat) Signed-off-by: Artyom Tarasenko Signed-off-by: Markus Armbruster Signed-off-by: Alex Bennée Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Daniel P. Berrangé Acked-by: Alex Bennée Message-id: 20240223161300.938542-1-peter.maydell@linaro.org Signed-off-by: Peter Maydell (cherry picked from commit fd7f95f23d6fe485332c1d4b489eb719fcb7c225) Signed-off-by: Michael Tokarev diff --git a/hw/rtc/sun4v-rtc.c b/hw/rtc/sun4v-rtc.c index e037acd1b5..ffcc0aa25d 100644 --- a/hw/rtc/sun4v-rtc.c +++ b/hw/rtc/sun4v-rtc.c @@ -5,7 +5,7 @@ * * Copyright (c) 2016 Artyom Tarasenko * - * This code is licensed under the GNU GPL v3 or (at your option) any later + * This code is licensed under the GNU GPL v2 or (at your option) any later * version. */ diff --git a/include/hw/rtc/sun4v-rtc.h b/include/hw/rtc/sun4v-rtc.h index fc54dfcba4..26a9eb6196 100644 --- a/include/hw/rtc/sun4v-rtc.h +++ b/include/hw/rtc/sun4v-rtc.h @@ -5,7 +5,7 @@ * * Copyright (c) 2016 Artyom Tarasenko * - * This code is licensed under the GNU GPL v3 or (at your option) any later + * This code is licensed under the GNU GPL v2 or (at your option) any later * version. */