Received: from list by lists.gnu.org with archive (Exim 4.71) id 1hOFSg-0004Gm-0g for mharc-qemu-trivial@gnu.org; Wed, 08 May 2019 01:49:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35649) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOFSd-0004EX-Rl for qemu-trivial@nongnu.org; Wed, 08 May 2019 01:49:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOFSc-0007x2-LI for qemu-trivial@nongnu.org; Wed, 08 May 2019 01:49:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44490) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hOFSa-0007vr-0y; Wed, 08 May 2019 01:49:44 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 49F5ADC8EF; Wed, 8 May 2019 05:49:43 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-28.ams2.redhat.com [10.36.116.28]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B5D98600D4; Wed, 8 May 2019 05:49:39 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 356331132B35; Wed, 8 May 2019 07:49:37 +0200 (CEST) From: Markus Armbruster To: Thomas Huth Cc: qemu-devel@nongnu.org, QEMU Trivial , "Michael S. Tsirkin" , Marcel Apfelbaum References: <1549471435-21887-1-git-send-email-thuth@redhat.com> <5a21d28a-fcb5-305c-d44f-158e69411b28@redhat.com> Date: Wed, 08 May 2019 07:49:37 +0200 In-Reply-To: (Thomas Huth's message of "Mon, 6 May 2019 07:52:24 +0200") Message-ID: <874l658phq.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 08 May 2019 05:49:43 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-trivial] [Qemu-devel] [PATCH] hw/i2c/smbus_ich9: Fix the confusing contributions-after-2012 statement X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 May 2019 05:49:49 -0000 Cc: Marcel in the hope of getting a pong. Thomas Huth writes: > On 29/03/2019 09.42, Thomas Huth wrote: >> On 06/02/2019 17.43, Thomas Huth wrote: >>> The license information in this file is rather confusing. The text >>> declares LGPL first, but then says that contributions after Jan 2012 >>> are licensed under the GPL instead. How should the average user who >>> just downloaded the release tarball know which part is now GPL and >>> which is LGPL? Also, as far as I can see, the file has been added to >>> QEMU *after* January in 2012, so the whole file should be GPL by >>> default instead. >>> >>> Furthermore, looking at the text of the LGPL (see COPYING.LIB in the >>> top directory), the license clearly states in section "3." that one >>> should rather replace the license information in such a case instead. >>> Thus let's clean up the confusing statements and use the proper GPL >>> text only. >>> >>> While we're at it, also remove the comment about acpi.c, since that >>> file does not exist under this name in the QEMU tree anymore. >>> >>> Signed-off-by: Thomas Huth >>> --- >>> hw/i2c/smbus_ich9.c | 21 ++++++++------------- >>> 1 file changed, 8 insertions(+), 13 deletions(-) >>> >>> diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c >>> index 2a8b49e..484aef5 100644 >>> --- a/hw/i2c/smbus_ich9.c >>> +++ b/hw/i2c/smbus_ich9.c >>> @@ -6,23 +6,18 @@ >>> * VA Linux Systems Japan K.K. >>> * Copyright (C) 2012 Jason Baron >>> * >>> - * This is based on acpi.c, but heavily rewritten. >>> + * 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) any later version. >>> * >>> - * This library is free software; you can redistribute it and/or >>> - * modify it under the terms of the GNU Lesser General Public >>> - * License version 2 as published by the Free Software Foundation. >>> - * >>> - * This library is distributed in the hope that it will be useful, >>> + * This program is distributed in the hope that it will be useful, >>> * but WITHOUT ANY WARRANTY; without even the implied warranty of >>> * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >>> - * Lesser General Public License for more details. >>> - * >>> - * You should have received a copy of the GNU Lesser General Public >>> - * License along with this library; if not, see >>> - * >>> - * Contributions after 2012-01-13 are licensed under the terms of the >>> - * GNU GPL, version 2 or (at your option) any later version. >>> + * General Public License for more details. >>> * >>> + * You should have received a copy of the GNU General Public License >>> + * along with this program; if not, see >>> */ >>> #include "qemu/osdep.h" >>> #include "hw/hw.h" >>> >> >> Ping? > > Ping^2 > > Thomas