Patchwork [1/1] s390: new contributions GPLv2 or later

login
register
mail settings
Submitter Christian Borntraeger
Date Nov. 12, 2012, 11:44 a.m.
Message ID <1352720650-34960-2-git-send-email-borntraeger@de.ibm.com>
Download mbox | patch
Permalink /patch/198374/
State New
Headers show

Comments

Christian Borntraeger - Nov. 12, 2012, 11:44 a.m.
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 <borntraeger@de.ibm.com>
---
 target-s390x/cpu.h |    5 ++++-
 target-s390x/kvm.c |    6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)
Christian Borntraeger - Nov. 12, 2012, 11:48 a.m.
> --- a/target-s390x/kvm.c
> +++ b/target-s390x/kvm.c
> @@ -2,6 +2,7 @@
>   * QEMU S390x KVM implementation
>   *
>   * Copyright (c) 2009 Alexander Graf <agraf@suse.de>
> + * Copyright IBM Corp. 2011

Arg. Should have been 2012.

Patch

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 <http://www.gnu.org/licenses/>.
  */
 #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 <agraf@suse.de>
+ * 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 <http://www.gnu.org/licenses/>.
  */