From patchwork Tue Jul 25 16:24:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 1812734 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=GzeVERzi; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R9MpH3FV7z1yXx for ; Wed, 26 Jul 2023 02:25:43 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qOKqg-0005Mj-4V; Tue, 25 Jul 2023 12:25:22 -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 1qOKqc-0005KX-NH for qemu-devel@nongnu.org; Tue, 25 Jul 2023 12:25:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qOKqS-0004Cg-Uu for qemu-devel@nongnu.org; Tue, 25 Jul 2023 12:25:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1690302305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xHhWBlakPAYmAyyjRvvdaQeVpdt73QVTG1xnr9gXccw=; b=GzeVERzivU9oZ7o6ZsV9VFjc6YbmpUMlsNEMU01qJ7JtxOh6wyyIb6g90zARESi6UY06UW nmal3E+Pl6GQaloxLjs0qWdLgcFYy6TUARg0EpDoUPx3xefFH1Ir3uk0R3jjJXoTwwAZrO K4PIvX/tg7j9vLN9GXUp5y2ByIg61Vc= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-145-G--NsH9sOeqXjrGradYSBg-1; Tue, 25 Jul 2023 12:25:02 -0400 X-MC-Unique: G--NsH9sOeqXjrGradYSBg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 835661C09A49; Tue, 25 Jul 2023 16:25:01 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.28.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id 807922166B28; Tue, 25 Jul 2023 16:25:00 +0000 (UTC) From: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Canokeys.org" , Gerd Hoffmann , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , "Hongren (Zenithal) Zheng" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , YuanYang Meng Subject: [PULL 2/2] hw/usb/canokey: change license to GPLv2+ Date: Tue, 25 Jul 2023 17:24:57 +0100 Message-ID: <20230725162457.156429-3-berrange@redhat.com> In-Reply-To: <20230725162457.156429-1-berrange@redhat.com> References: <20230725162457.156429-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: "Hongren (Zenithal) Zheng" Apache license is considered by some to be not compatible with GPLv2+. Since QEMU as combined work is GPLv2-only, these two files should be made compatible. Reported-by: "Daniel P. Berrangé" Link: https://lore.kernel.org/qemu-devel/ZEpKXncC%2Fe6FKRe9@redhat.com/ Reviewed-by: Philippe Mathieu-Daudé Acked-By: canokeys.org (http://canokeys.org) Acked-by: YuanYang Meng Signed-off-by: Hongren (Zenithal) Zheng Signed-off-by: Daniel P. Berrangé --- hw/usb/canokey.c | 2 +- hw/usb/canokey.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/usb/canokey.c b/hw/usb/canokey.c index bbc5da07b5..b306eeb20e 100644 --- a/hw/usb/canokey.c +++ b/hw/usb/canokey.c @@ -4,7 +4,7 @@ * Copyright (c) 2021-2022 Canokeys.org * Written by Hongren (Zenithal) Zheng * - * This code is licensed under the Apache-2.0. + * This code is licensed under the GPL v2 or later. */ #include "qemu/osdep.h" diff --git a/hw/usb/canokey.h b/hw/usb/canokey.h index 24cf304203..e528889d33 100644 --- a/hw/usb/canokey.h +++ b/hw/usb/canokey.h @@ -4,7 +4,7 @@ * Copyright (c) 2021-2022 Canokeys.org * Written by Hongren (Zenithal) Zheng * - * This code is licensed under the Apache-2.0. + * This code is licensed under the GPL v2 or later. */ #ifndef CANOKEY_H