From patchwork Mon Nov 12 11:44:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Borntraeger X-Patchwork-Id: 198374 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3362B2C0089 for ; Mon, 12 Nov 2012 22:44:35 +1100 (EST) Received: from localhost ([::1]:36588 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TXsRN-0000Sc-F9 for incoming@patchwork.ozlabs.org; Mon, 12 Nov 2012 06:44:33 -0500 Received: from eggs.gnu.org ([208.118.235.92]:40509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TXsQx-00082g-DB for qemu-devel@nongnu.org; Mon, 12 Nov 2012 06:44:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TXsQu-00086z-AZ for qemu-devel@nongnu.org; Mon, 12 Nov 2012 06:44:07 -0500 Received: from e06smtp16.uk.ibm.com ([195.75.94.112]:46510) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TXsQu-000857-2R for qemu-devel@nongnu.org; Mon, 12 Nov 2012 06:44:04 -0500 Received: from /spool/local by e06smtp16.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 12 Nov 2012 11:44:02 -0000 Received: from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196) by e06smtp16.uk.ibm.com (192.168.101.146) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 12 Nov 2012 11:44:00 -0000 Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by b06cxnps4074.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qACBhq0R49086626 for ; Mon, 12 Nov 2012 11:43:52 GMT Received: from d06av02.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qACBhvR5012643 for ; Mon, 12 Nov 2012 04:43:58 -0700 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qACBhsho012489; Mon, 12 Nov 2012 04:43:55 -0700 Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 25651) id 52229122443A; Mon, 12 Nov 2012 12:43:54 +0100 (CET) From: Christian Borntraeger To: agraf@suse.de Date: Mon, 12 Nov 2012 12:44:10 +0100 Message-Id: <1352720650-34960-2-git-send-email-borntraeger@de.ibm.com> X-Mailer: git-send-email 1.7.10.1 In-Reply-To: <1352720650-34960-1-git-send-email-borntraeger@de.ibm.com> References: <1352720650-34960-1-git-send-email-borntraeger@de.ibm.com> x-cbid: 12111211-3548-0000-0000-000003A70DDC X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 195.75.94.112 Cc: cornelia.huck@de.ibm.com, borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, qemu-devel@nongnu.org, aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 1/1] s390: new contributions GPLv2 or later X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 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 IBMs s390 contributions were meant to to be gplv2 or later (since we were contributing to qemu). Several of the s390 specific files link to gpl code anyway, so lets clarify the licence statement for new contributions for those files that we have touched multiple times or will likely touch again. This patch does not touch files that mostly deal with tcg. Signed-off-by: Christian Borntraeger --- target-s390x/cpu.h | 5 ++++- target-s390x/kvm.c | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 0f9a1f7..1ceb71e 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -13,7 +13,10 @@ * 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 + * Contributions after 2012-10-29 are licensed under the terms of the + * GNU GPL, version 2 or (at your option) any later version. + * + * You should have received a copy of the GNU (Lesser) General Public * License along with this library; if not, see . */ #ifndef CPU_S390X_H diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 94de764..99a72b0 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -2,6 +2,7 @@ * QEMU S390x KVM implementation * * Copyright (c) 2009 Alexander Graf + * Copyright IBM Corp. 2011 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -13,7 +14,10 @@ * 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 + * Contributions after 2012-10-29 are licensed under the terms of the + * GNU GPL, version 2 or (at your option) any later version. + * + * You should have received a copy of the GNU (Lesser) General Public * License along with this library; if not, see . */