All of lore.kernel.org
 help / color / mirror / Atom feed
* [kvm-unit-tests PATCH 0/2] s390x: Move from LGPL 2 to GPL 2
@ 2020-12-08 15:09 Janosch Frank
  2020-12-08 15:09 ` [kvm-unit-tests PATCH 1/2] s390x: Move to GPL 2 and SPDX license identifiers Janosch Frank
                   ` (4 more replies)
  0 siblings, 5 replies; 19+ messages in thread
From: Janosch Frank @ 2020-12-08 15:09 UTC (permalink / raw)
  To: kvm; +Cc: thuth, david, cohuck, linux-s390

KVM and the KVM unit tests should be able to share code to improve
development speed and the LGPL is currently preventing us from doing
exactly that. Additionally we have a multitude of different licenses
in s390x files: GPL 2 only, GPL 2 or greater, LGPL 2 and LGPL 2.1 or
later.

This patch set tries to move the licenses to GPL 2 where
possible. Also we introduce the SPDX identifiers so the file headers
are more readable.

Janosch Frank (2):
  s390x: Move to GPL 2 and SPDX license identifiers
  s390x: lib: Move to GPL 2 and SPDX license identifiers

 lib/s390x/asm-offsets.c     | 4 +---
 lib/s390x/asm/arch_def.h    | 4 +---
 lib/s390x/asm/asm-offsets.h | 4 +---
 lib/s390x/asm/barrier.h     | 4 +---
 lib/s390x/asm/cpacf.h       | 1 +
 lib/s390x/asm/facility.h    | 4 +---
 lib/s390x/asm/float.h       | 4 +---
 lib/s390x/asm/interrupt.h   | 4 +---
 lib/s390x/asm/io.h          | 4 +---
 lib/s390x/asm/mem.h         | 4 +---
 lib/s390x/asm/page.h        | 4 +---
 lib/s390x/asm/pgtable.h     | 4 +---
 lib/s390x/asm/sigp.h        | 4 +---
 lib/s390x/asm/spinlock.h    | 4 +---
 lib/s390x/asm/stack.h       | 4 +---
 lib/s390x/asm/time.h        | 4 +---
 lib/s390x/css.h             | 4 +---
 lib/s390x/css_dump.c        | 4 +---
 lib/s390x/css_lib.c         | 4 +---
 lib/s390x/interrupt.c       | 4 +---
 lib/s390x/io.c              | 4 +---
 lib/s390x/mmu.c             | 4 +---
 lib/s390x/mmu.h             | 4 +---
 lib/s390x/sclp-console.c    | 5 +----
 lib/s390x/sclp.c            | 4 +---
 lib/s390x/sclp.h            | 5 +----
 lib/s390x/smp.c             | 4 +---
 lib/s390x/smp.h             | 4 +---
 lib/s390x/stack.c           | 4 +---
 lib/s390x/vm.c              | 3 +--
 lib/s390x/vm.h              | 3 +--
 s390x/cmm.c                 | 4 +---
 s390x/cpumodel.c            | 4 +---
 s390x/css.c                 | 4 +---
 s390x/cstart64.S            | 4 +---
 s390x/diag10.c              | 4 +---
 s390x/diag288.c             | 4 +---
 s390x/diag308.c             | 5 +----
 s390x/emulator.c            | 4 +---
 s390x/gs.c                  | 4 +---
 s390x/iep.c                 | 4 +---
 s390x/intercept.c           | 4 +---
 s390x/pfmf.c                | 4 +---
 s390x/sclp.c                | 4 +---
 s390x/selftest.c            | 4 +---
 s390x/skey.c                | 4 +---
 s390x/skrf.c                | 4 +---
 s390x/smp.c                 | 4 +---
 s390x/sthyi.c               | 4 +---
 s390x/sthyi.h               | 4 +---
 s390x/stsi.c                | 4 +---
 s390x/uv-guest.c            | 4 +---
 s390x/vector.c              | 4 +---
 53 files changed, 53 insertions(+), 157 deletions(-)

-- 
2.25.1

^ permalink raw reply	[flat|nested] 19+ messages in thread

* [kvm-unit-tests PATCH 1/2] s390x: Move to GPL 2 and SPDX license identifiers
  2020-12-08 15:09 [kvm-unit-tests PATCH 0/2] s390x: Move from LGPL 2 to GPL 2 Janosch Frank
@ 2020-12-08 15:09 ` Janosch Frank
  2020-12-08 15:14   ` Thomas Huth
                     ` (3 more replies)
  2020-12-08 15:09 ` [kvm-unit-tests PATCH 2/2] s390x: lib: " Janosch Frank
                   ` (3 subsequent siblings)
  4 siblings, 4 replies; 19+ messages in thread
From: Janosch Frank @ 2020-12-08 15:09 UTC (permalink / raw)
  To: kvm; +Cc: thuth, david, cohuck, linux-s390

In the past we had some issues when developers wanted to use code
snippets or constants from the kernel in a test or in the library. To
remedy that the s390x maintainers decided to move all files to GPL
2 (if possible).

At the same time let's move to SPDX identifiers as they are much nicer
to read.

Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
---
 s390x/cmm.c       | 4 +---
 s390x/cpumodel.c  | 4 +---
 s390x/css.c       | 4 +---
 s390x/cstart64.S  | 4 +---
 s390x/diag10.c    | 4 +---
 s390x/diag288.c   | 4 +---
 s390x/diag308.c   | 5 +----
 s390x/emulator.c  | 4 +---
 s390x/gs.c        | 4 +---
 s390x/iep.c       | 4 +---
 s390x/intercept.c | 4 +---
 s390x/pfmf.c      | 4 +---
 s390x/sclp.c      | 4 +---
 s390x/selftest.c  | 4 +---
 s390x/skey.c      | 4 +---
 s390x/skrf.c      | 4 +---
 s390x/smp.c       | 4 +---
 s390x/sthyi.c     | 4 +---
 s390x/sthyi.h     | 4 +---
 s390x/stsi.c      | 4 +---
 s390x/uv-guest.c  | 4 +---
 s390x/vector.c    | 4 +---
 22 files changed, 22 insertions(+), 67 deletions(-)

diff --git a/s390x/cmm.c b/s390x/cmm.c
index fe4d9df..c3f0c93 100644
--- a/s390x/cmm.c
+++ b/s390x/cmm.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * CMM tests (ESSA)
  *
@@ -5,9 +6,6 @@
  *
  * Authors:
  *  Janosch Frank <frankja@linux.vnet.ibm.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 
 #include <libcflat.h>
diff --git a/s390x/cpumodel.c b/s390x/cpumodel.c
index 116a966..4dd8b96 100644
--- a/s390x/cpumodel.c
+++ b/s390x/cpumodel.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Test the known dependencies for facilities
  *
@@ -5,9 +6,6 @@
  *
  * Authors:
  *    Christian Borntraeger <borntraeger@de.ibm.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 
 #include <asm/facility.h>
diff --git a/s390x/css.c b/s390x/css.c
index ee3bc83..23a7b7c 100644
--- a/s390x/css.c
+++ b/s390x/css.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Channel Subsystem tests
  *
@@ -5,9 +6,6 @@
  *
  * Authors:
  *  Pierre Morel <pmorel@linux.ibm.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2.
  */
 
 #include <libcflat.h>
diff --git a/s390x/cstart64.S b/s390x/cstart64.S
index 4e51150..cc86fc7 100644
--- a/s390x/cstart64.S
+++ b/s390x/cstart64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * s390x startup code
  *
@@ -6,9 +7,6 @@
  * Authors:
  *  Thomas Huth <thuth@redhat.com>
  *  David Hildenbrand <david@redhat.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #include <asm/asm-offsets.h>
 #include <asm/sigp.h>
diff --git a/s390x/diag10.c b/s390x/diag10.c
index 7ee8945..579a7a5 100644
--- a/s390x/diag10.c
+++ b/s390x/diag10.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Release pages hypercall tests (DIAG 10)
  *
@@ -5,9 +6,6 @@
  *
  * Authors:
  *  Janosch Frank <frankja@linux.vnet.ibm.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 
 #include <libcflat.h>
diff --git a/s390x/diag288.c b/s390x/diag288.c
index e2ecdc8..e132ff0 100644
--- a/s390x/diag288.c
+++ b/s390x/diag288.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Timer Event DIAG288 test
  *
@@ -5,9 +6,6 @@
  *
  * Authors:
  *  Janosch Frank <frankja@linux.ibm.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 
 #include <libcflat.h>
diff --git a/s390x/diag308.c b/s390x/diag308.c
index 7fc4abd..c9d6c49 100644
--- a/s390x/diag308.c
+++ b/s390x/diag308.c
@@ -1,11 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Diagnose 0x308 hypercall tests
  *
  * Copyright (c) 2019 Thomas Huth, Red Hat Inc.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2, or (at
- * your option) any later version.
  */
 
 #include <libcflat.h>
diff --git a/s390x/emulator.c b/s390x/emulator.c
index 70ef51a..b2787a5 100644
--- a/s390x/emulator.c
+++ b/s390x/emulator.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Emulator tests - for s390x CPU instructions that are usually interpreted
  *                  by the hardware
@@ -6,9 +7,6 @@
  *
  * Authors:
  *  David Hildenbrand <david@redhat.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #include <libcflat.h>
 #include <asm/cpacf.h>
diff --git a/s390x/gs.c b/s390x/gs.c
index f685aa9..1376d0e 100644
--- a/s390x/gs.c
+++ b/s390x/gs.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Tests guarded storage support.
  *
@@ -6,9 +7,6 @@
  * Authors:
  *    Martin Schwidefsky <schwidefsky@de.ibm.com>
  *    Janosch Frank <frankja@de.ibm.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #include <libcflat.h>
 #include <asm/page.h>
diff --git a/s390x/iep.c b/s390x/iep.c
index 55c01ee..fe167ef 100644
--- a/s390x/iep.c
+++ b/s390x/iep.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Instruction Execution Prevention (IEP) DAT test.
  *
@@ -5,9 +6,6 @@
  *
  * Authors:
  *	Janosch Frank <frankja@de.ibm.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #include <libcflat.h>
 #include <vmalloc.h>
diff --git a/s390x/intercept.c b/s390x/intercept.c
index 2e38257..cde2f5f 100644
--- a/s390x/intercept.c
+++ b/s390x/intercept.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Interception tests - for s390x CPU instruction that cause a VM exit
  *
@@ -5,9 +6,6 @@
  *
  * Authors:
  *  Thomas Huth <thuth@redhat.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #include <libcflat.h>
 #include <asm/asm-offsets.h>
diff --git a/s390x/pfmf.c b/s390x/pfmf.c
index ac57fe4..2f3cb11 100644
--- a/s390x/pfmf.c
+++ b/s390x/pfmf.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Perform Frame Management Function (pfmf) tests
  *
@@ -5,9 +6,6 @@
  *
  * Authors:
  *  Janosch Frank <frankja@linux.vnet.ibm.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #include <libcflat.h>
 #include <asm/asm-offsets.h>
diff --git a/s390x/sclp.c b/s390x/sclp.c
index 7d92bf3..73d722f 100644
--- a/s390x/sclp.c
+++ b/s390x/sclp.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Service Call tests
  *
@@ -5,9 +6,6 @@
  *
  * Authors:
  *  Claudio Imbrenda <imbrenda@linux.ibm.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2.
  */
 
 #include <libcflat.h>
diff --git a/s390x/selftest.c b/s390x/selftest.c
index eaf5b18..b2fe2e7 100644
--- a/s390x/selftest.c
+++ b/s390x/selftest.c
@@ -1,12 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017 Red Hat Inc
  *
  * Authors:
  *  Thomas Huth <thuth@redhat.com>
  *  David Hildenbrand <david@redhat.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #include <libcflat.h>
 #include <util.h>
diff --git a/s390x/skey.c b/s390x/skey.c
index 86d15e2..2539944 100644
--- a/s390x/skey.c
+++ b/s390x/skey.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Storage key tests
  *
@@ -5,9 +6,6 @@
  *
  * Authors:
  *  Janosch Frank <frankja@linux.vnet.ibm.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #include <libcflat.h>
 #include <asm/asm-offsets.h>
diff --git a/s390x/skrf.c b/s390x/skrf.c
index b19d0f4..57524ba 100644
--- a/s390x/skrf.c
+++ b/s390x/skrf.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Storage key removal facility tests
  *
@@ -5,9 +6,6 @@
  *
  * Authors:
  *  Janosch Frank <frankja@linux.ibm.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2.
  */
 #include <libcflat.h>
 #include <asm/asm-offsets.h>
diff --git a/s390x/smp.c b/s390x/smp.c
index 4ca1dce..b0ece49 100644
--- a/s390x/smp.c
+++ b/s390x/smp.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Tests sigp emulation
  *
@@ -5,9 +6,6 @@
  *
  * Authors:
  *    Janosch Frank <frankja@linux.ibm.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2.
  */
 #include <libcflat.h>
 #include <asm/asm-offsets.h>
diff --git a/s390x/sthyi.c b/s390x/sthyi.c
index 68c57cb..d8dfc85 100644
--- a/s390x/sthyi.c
+++ b/s390x/sthyi.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Tests exceptions and data validity for the emulated sthyi
  * instruction.
@@ -6,9 +7,6 @@
  *
  * Authors:
  *    Janosch Frank <frankja@linux.vnet.ibm.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #include <libcflat.h>
 #include <asm/asm-offsets.h>
diff --git a/s390x/sthyi.h b/s390x/sthyi.h
index 06f757f..bbd74c6 100644
--- a/s390x/sthyi.h
+++ b/s390x/sthyi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * STHYI related flags and structure definitions.
  *
@@ -5,9 +6,6 @@
  *
  * Authors:
  *    Janosch Frank <frankja@linux.vnet.ibm.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #ifndef _STHYI_H_
 #define _STHYI_H_
diff --git a/s390x/stsi.c b/s390x/stsi.c
index b81cea7..4109b8d 100644
--- a/s390x/stsi.c
+++ b/s390x/stsi.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Store System Information tests
  *
@@ -5,9 +6,6 @@
  *
  * Authors:
  *  Janosch Frank <frankja@linux.ibm.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 
 #include <libcflat.h>
diff --git a/s390x/uv-guest.c b/s390x/uv-guest.c
index d47333e..bc947ab 100644
--- a/s390x/uv-guest.c
+++ b/s390x/uv-guest.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Guest Ultravisor Call tests
  *
@@ -5,9 +6,6 @@
  *
  * Authors:
  *  Janosch Frank <frankja@linux.ibm.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2.
  */
 
 #include <libcflat.h>
diff --git a/s390x/vector.c b/s390x/vector.c
index 0159ba1..d1b6a57 100644
--- a/s390x/vector.c
+++ b/s390x/vector.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Tests vector instruction support
  *
@@ -5,9 +6,6 @@
  *
  * Authors:
  *    Janosch Frank <frankja@de.ibm.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #include <libcflat.h>
 #include <asm/page.h>
-- 
2.25.1

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* [kvm-unit-tests PATCH 2/2] s390x: lib: Move to GPL 2 and SPDX license identifiers
  2020-12-08 15:09 [kvm-unit-tests PATCH 0/2] s390x: Move from LGPL 2 to GPL 2 Janosch Frank
  2020-12-08 15:09 ` [kvm-unit-tests PATCH 1/2] s390x: Move to GPL 2 and SPDX license identifiers Janosch Frank
@ 2020-12-08 15:09 ` Janosch Frank
  2020-12-08 15:21   ` Thomas Huth
                     ` (3 more replies)
  2020-12-09  9:01 ` [kvm-unit-tests PATCH 0/2] s390x: Move from LGPL 2 to GPL 2 Christian Borntraeger
                   ` (2 subsequent siblings)
  4 siblings, 4 replies; 19+ messages in thread
From: Janosch Frank @ 2020-12-08 15:09 UTC (permalink / raw)
  To: kvm; +Cc: thuth, david, cohuck, linux-s390

In the past we had some issues when developers wanted to use code
snippets or constants from the kernel in a test or in the library. To
remedy that the s390x maintainers decided to move all files to GPL 2
(if possible).

At the same time let's move to SPDX identifiers as they are much nicer
to read.

Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
---
 lib/s390x/asm-offsets.c     | 4 +---
 lib/s390x/asm/arch_def.h    | 4 +---
 lib/s390x/asm/asm-offsets.h | 4 +---
 lib/s390x/asm/barrier.h     | 4 +---
 lib/s390x/asm/cpacf.h       | 1 +
 lib/s390x/asm/facility.h    | 4 +---
 lib/s390x/asm/float.h       | 4 +---
 lib/s390x/asm/interrupt.h   | 4 +---
 lib/s390x/asm/io.h          | 4 +---
 lib/s390x/asm/mem.h         | 4 +---
 lib/s390x/asm/page.h        | 4 +---
 lib/s390x/asm/pgtable.h     | 4 +---
 lib/s390x/asm/sigp.h        | 4 +---
 lib/s390x/asm/spinlock.h    | 4 +---
 lib/s390x/asm/stack.h       | 4 +---
 lib/s390x/asm/time.h        | 4 +---
 lib/s390x/css.h             | 4 +---
 lib/s390x/css_dump.c        | 4 +---
 lib/s390x/css_lib.c         | 4 +---
 lib/s390x/interrupt.c       | 4 +---
 lib/s390x/io.c              | 4 +---
 lib/s390x/mmu.c             | 4 +---
 lib/s390x/mmu.h             | 4 +---
 lib/s390x/sclp-console.c    | 5 +----
 lib/s390x/sclp.c            | 4 +---
 lib/s390x/sclp.h            | 5 +----
 lib/s390x/smp.c             | 4 +---
 lib/s390x/smp.h             | 4 +---
 lib/s390x/stack.c           | 4 +---
 lib/s390x/vm.c              | 3 +--
 lib/s390x/vm.h              | 3 +--
 31 files changed, 31 insertions(+), 90 deletions(-)

diff --git a/lib/s390x/asm-offsets.c b/lib/s390x/asm-offsets.c
index 61d2658..ee94ed3 100644
--- a/lib/s390x/asm-offsets.c
+++ b/lib/s390x/asm-offsets.c
@@ -1,11 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017 Red Hat Inc
  *
  * Authors:
  *  David Hildenbrand <david@redhat.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #include <libcflat.h>
 #include <kbuild.h>
diff --git a/lib/s390x/asm/arch_def.h b/lib/s390x/asm/arch_def.h
index edc06ef..f3ab830 100644
--- a/lib/s390x/asm/arch_def.h
+++ b/lib/s390x/asm/arch_def.h
@@ -1,11 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017 Red Hat Inc
  *
  * Authors:
  *  David Hildenbrand <david@redhat.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #ifndef _ASM_S390X_ARCH_DEF_H_
 #define _ASM_S390X_ARCH_DEF_H_
diff --git a/lib/s390x/asm/asm-offsets.h b/lib/s390x/asm/asm-offsets.h
index a6d7af8..bed7f8e 100644
--- a/lib/s390x/asm/asm-offsets.h
+++ b/lib/s390x/asm/asm-offsets.h
@@ -1,10 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017 Red Hat Inc
  *
  * Authors:
  *  David Hildenbrand <david@redhat.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #include <generated/asm-offsets.h>
diff --git a/lib/s390x/asm/barrier.h b/lib/s390x/asm/barrier.h
index d862e78..8e2fd6d 100644
--- a/lib/s390x/asm/barrier.h
+++ b/lib/s390x/asm/barrier.h
@@ -1,12 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017 Red Hat Inc
  *
  * Authors:
  *  Thomas Huth <thuth@redhat.com>
  *  David Hildenbrand <david@redhat.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #ifndef _ASM_S390X_BARRIER_H_
 #define _ASM_S390X_BARRIER_H_
diff --git a/lib/s390x/asm/cpacf.h b/lib/s390x/asm/cpacf.h
index 2146a01..805fcf1 100644
--- a/lib/s390x/asm/cpacf.h
+++ b/lib/s390x/asm/cpacf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * CP Assist for Cryptographic Functions (CPACF)
  *
diff --git a/lib/s390x/asm/facility.h b/lib/s390x/asm/facility.h
index def2705..7828cf8 100644
--- a/lib/s390x/asm/facility.h
+++ b/lib/s390x/asm/facility.h
@@ -1,11 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017 Red Hat Inc
  *
  * Authors:
  *  David Hildenbrand <david@redhat.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #ifndef _ASM_S390X_FACILITY_H_
 #define _ASM_S390X_FACILITY_H_
diff --git a/lib/s390x/asm/float.h b/lib/s390x/asm/float.h
index f61fa62..1367944 100644
--- a/lib/s390x/asm/float.h
+++ b/lib/s390x/asm/float.h
@@ -1,11 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2018 Red Hat Inc
  *
  * Authors:
  *  David Hildenbrand <david@redhat.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #ifndef _ASM_S390X_FLOAT_H_
 #define _ASM_S390X_FLOAT_H_
diff --git a/lib/s390x/asm/interrupt.h b/lib/s390x/asm/interrupt.h
index 2772e6b..1a2e2cd 100644
--- a/lib/s390x/asm/interrupt.h
+++ b/lib/s390x/asm/interrupt.h
@@ -1,11 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017 Red Hat Inc
  *
  * Authors:
  *  David Hildenbrand <david@redhat.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #ifndef _ASMS390X_IRQ_H_
 #define _ASMS390X_IRQ_H_
diff --git a/lib/s390x/asm/io.h b/lib/s390x/asm/io.h
index 094dace..1dc6283 100644
--- a/lib/s390x/asm/io.h
+++ b/lib/s390x/asm/io.h
@@ -1,12 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017 Red Hat Inc
  *
  * Authors:
  *  Thomas Huth <thuth@redhat.com>
  *  David Hildenbrand <david@redhat.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #ifndef _ASMS390X_IO_H_
 #define _ASMS390X_IO_H_
diff --git a/lib/s390x/asm/mem.h b/lib/s390x/asm/mem.h
index c78bfa2..281390e 100644
--- a/lib/s390x/asm/mem.h
+++ b/lib/s390x/asm/mem.h
@@ -1,11 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Physical memory management related functions and definitions.
  *
  * Copyright IBM Corp. 2018
  * Author(s): Janosch Frank <frankja@de.ibm.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #ifndef _ASM_S390_MEM_H
 #define _ASM_S390_MEM_H
diff --git a/lib/s390x/asm/page.h b/lib/s390x/asm/page.h
index bc19154..f130f93 100644
--- a/lib/s390x/asm/page.h
+++ b/lib/s390x/asm/page.h
@@ -1,12 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017 Red Hat Inc
  *
  * Authors:
  *  Thomas Huth <thuth@redhat.com>
  *  David Hildenbrand <david@redhat.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #ifndef _ASMS390X_PAGE_H_
 #define _ASMS390X_PAGE_H_
diff --git a/lib/s390x/asm/pgtable.h b/lib/s390x/asm/pgtable.h
index e15bee9..277f348 100644
--- a/lib/s390x/asm/pgtable.h
+++ b/lib/s390x/asm/pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * s390x page table definitions and functions
  *
@@ -5,9 +6,6 @@
  *
  * Authors:
  *  David Hildenbrand <david@redhat.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #ifndef _ASMS390X_PGTABLE_H_
 #define _ASMS390X_PGTABLE_H_
diff --git a/lib/s390x/asm/sigp.h b/lib/s390x/asm/sigp.h
index 2d52313..00844d2 100644
--- a/lib/s390x/asm/sigp.h
+++ b/lib/s390x/asm/sigp.h
@@ -1,10 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * SIGP related definitions.
  *
  * Copied from the Linux kernel file arch/s390/include/asm/sigp.h
- *
- * This work is licensed under the terms of the GNU GPL, version
- * 2.
  */
 
 #ifndef ASM_S390X_SIGP_H
diff --git a/lib/s390x/asm/spinlock.h b/lib/s390x/asm/spinlock.h
index f7d3982..677d2cd 100644
--- a/lib/s390x/asm/spinlock.h
+++ b/lib/s390x/asm/spinlock.h
@@ -1,12 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017 Red Hat Inc
  *
  * Authors:
  *  Thomas Huth <thuth@redhat.com>
  *  David Hildenbrand <david@redhat.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #ifndef __ASMS390X_SPINLOCK_H
 #define __ASMS390X_SPINLOCK_H
diff --git a/lib/s390x/asm/stack.h b/lib/s390x/asm/stack.h
index e36d975..909da36 100644
--- a/lib/s390x/asm/stack.h
+++ b/lib/s390x/asm/stack.h
@@ -1,12 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017 Red Hat Inc
  *
  * Authors:
  *  Thomas Huth <thuth@redhat.com>
  *  David Hildenbrand <david@redhat.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #ifndef _ASMS390X_STACK_H_
 #define _ASMS390X_STACK_H_
diff --git a/lib/s390x/asm/time.h b/lib/s390x/asm/time.h
index 7375aa2..0d67f72 100644
--- a/lib/s390x/asm/time.h
+++ b/lib/s390x/asm/time.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Clock utilities for s390
  *
@@ -6,9 +7,6 @@
  *
  * Copied from the s390/intercept test by:
  *  Pierre Morel <pmorel@linux.ibm.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2.
  */
 #ifndef ASM_S390X_TIME_H
 #define ASM_S390X_TIME_H
diff --git a/lib/s390x/css.h b/lib/s390x/css.h
index 221b67c..d10d265 100644
--- a/lib/s390x/css.h
+++ b/lib/s390x/css.h
@@ -1,11 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * CSS definitions
  *
  * Copyright IBM, Corp. 2020
  * Author: Pierre Morel <pmorel@linux.ibm.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2.
  */
 
 #ifndef CSS_H
diff --git a/lib/s390x/css_dump.c b/lib/s390x/css_dump.c
index 1266f04..2268086 100644
--- a/lib/s390x/css_dump.c
+++ b/lib/s390x/css_dump.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Channel subsystem structures dumping
  *
@@ -6,9 +7,6 @@
  * Authors:
  *  Pierre Morel <pmorel@linux.ibm.com>
  *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2.
- *
  * Description:
  * Provides the dumping functions for various structures used by subchannels:
  * - ORB  : Operation request block, describes the I/O operation and points to
diff --git a/lib/s390x/css_lib.c b/lib/s390x/css_lib.c
index 8e02371..5af6f77 100644
--- a/lib/s390x/css_lib.c
+++ b/lib/s390x/css_lib.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Channel Subsystem tests library
  *
@@ -5,9 +6,6 @@
  *
  * Authors:
  *  Pierre Morel <pmorel@linux.ibm.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2.
  */
 #include <libcflat.h>
 #include <alloc_phys.h>
diff --git a/lib/s390x/interrupt.c b/lib/s390x/interrupt.c
index a074505..bac8862 100644
--- a/lib/s390x/interrupt.c
+++ b/lib/s390x/interrupt.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * s390x interrupt handling
  *
@@ -5,9 +6,6 @@
  *
  * Authors:
  *  David Hildenbrand <david@redhat.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #include <libcflat.h>
 #include <asm/barrier.h>
diff --git a/lib/s390x/io.c b/lib/s390x/io.c
index c0f0bf7..1ff0589 100644
--- a/lib/s390x/io.c
+++ b/lib/s390x/io.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * s390x io implementation
  *
@@ -6,9 +7,6 @@
  * Authors:
  *  Thomas Huth <thuth@redhat.com>
  *  David Hildenbrand <david@redhat.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #include <libcflat.h>
 #include <argv.h>
diff --git a/lib/s390x/mmu.c b/lib/s390x/mmu.c
index 912236c..5c51736 100644
--- a/lib/s390x/mmu.c
+++ b/lib/s390x/mmu.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * s390x MMU
  *
@@ -5,9 +6,6 @@
  *
  * Authors:
  *  David Hildenbrand <david@redhat.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 
 #include <libcflat.h>
diff --git a/lib/s390x/mmu.h b/lib/s390x/mmu.h
index f5095fa..603f289 100644
--- a/lib/s390x/mmu.h
+++ b/lib/s390x/mmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * s390x mmu functions
  *
@@ -5,9 +6,6 @@
  *
  * Authors:
  *	Janosch Frank <frankja@de.ibm.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #ifndef _ASMS390X_MMU_H_
 #define _ASMS390X_MMU_H_
diff --git a/lib/s390x/sclp-console.c b/lib/s390x/sclp-console.c
index 6067a1a..0327a0b 100644
--- a/lib/s390x/sclp-console.c
+++ b/lib/s390x/sclp-console.c
@@ -1,11 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only-or-later */
 /*
  * SCLP ASCII access driver
  *
  * Copyright (c) 2013 Alexander Graf <agraf@suse.de>
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or (at
- * your option) any later version. See the COPYING file in the top-level
- * directory.
  */
 
 #include <libcflat.h>
diff --git a/lib/s390x/sclp.c b/lib/s390x/sclp.c
index 4e2ac18..08a4813 100644
--- a/lib/s390x/sclp.c
+++ b/lib/s390x/sclp.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * s390x SCLP driver
  *
@@ -5,9 +6,6 @@
  *
  * Authors:
  *  David Hildenbrand <david@redhat.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 
 #include <libcflat.h>
diff --git a/lib/s390x/sclp.h b/lib/s390x/sclp.h
index 675f07e..9a6aad0 100644
--- a/lib/s390x/sclp.h
+++ b/lib/s390x/sclp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only-or-later */
 /*
  * SCLP definitions
  *
@@ -7,10 +8,6 @@
  * and based on the file include/hw/s390x/sclp.h from QEMU
  * Copyright IBM, Corp. 2012
  * Author: Christian Borntraeger <borntraeger@de.ibm.com>
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or (at
- * your option) any later version. See the COPYING file in the top-level
- * directory.
  */
 
 #ifndef SCLP_H
diff --git a/lib/s390x/smp.c b/lib/s390x/smp.c
index 77d80ca..c4f02dc 100644
--- a/lib/s390x/smp.c
+++ b/lib/s390x/smp.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * s390x smp
  * Based on Linux's arch/s390/kernel/smp.c and
@@ -7,9 +8,6 @@
  *
  * Authors:
  *  Janosch Frank <frankja@linux.ibm.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2.
  */
 #include <libcflat.h>
 #include <asm/arch_def.h>
diff --git a/lib/s390x/smp.h b/lib/s390x/smp.h
index d66e39a..67ff16c 100644
--- a/lib/s390x/smp.h
+++ b/lib/s390x/smp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * s390x smp
  *
@@ -5,9 +6,6 @@
  *
  * Authors:
  *  Janosch Frank <frankja@linux.ibm.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2.
  */
 #ifndef SMP_H
 #define SMP_H
diff --git a/lib/s390x/stack.c b/lib/s390x/stack.c
index cd34b20..0fcd1af 100644
--- a/lib/s390x/stack.c
+++ b/lib/s390x/stack.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * s390x stack implementation
  *
@@ -6,9 +7,6 @@
  * Authors:
  *  Thomas Huth <thuth@redhat.com>
  *  David Hildenbrand <david@redhat.com>
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Library General Public License version 2.
  */
 #include <libcflat.h>
 #include <stack.h>
diff --git a/lib/s390x/vm.c b/lib/s390x/vm.c
index c852713..aa8b0ce 100644
--- a/lib/s390x/vm.c
+++ b/lib/s390x/vm.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only-or-later */
 /*
  * Functions to retrieve VM-specific information
  *
@@ -5,8 +6,6 @@
  *
  * Authors:
  *  Thomas Huth <thuth@redhat.com>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
 #include <libcflat.h>
diff --git a/lib/s390x/vm.h b/lib/s390x/vm.h
index 33008d8..5f95645 100644
--- a/lib/s390x/vm.h
+++ b/lib/s390x/vm.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only-or-later */
 /*
  * Functions to retrieve VM-specific information
  *
  * Copyright (c) 2020 Red Hat Inc
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
 #ifndef S390X_VM_H
-- 
2.25.1

^ permalink raw reply related	[flat|nested] 19+ messages in thread

* Re: [kvm-unit-tests PATCH 1/2] s390x: Move to GPL 2 and SPDX license identifiers
  2020-12-08 15:09 ` [kvm-unit-tests PATCH 1/2] s390x: Move to GPL 2 and SPDX license identifiers Janosch Frank
@ 2020-12-08 15:14   ` Thomas Huth
  2020-12-09  9:12   ` David Hildenbrand
                     ` (2 subsequent siblings)
  3 siblings, 0 replies; 19+ messages in thread
From: Thomas Huth @ 2020-12-08 15:14 UTC (permalink / raw)
  To: Janosch Frank, kvm; +Cc: david, cohuck, linux-s390

On 08/12/2020 16.09, Janosch Frank wrote:
> In the past we had some issues when developers wanted to use code
> snippets or constants from the kernel in a test or in the library. To
> remedy that the s390x maintainers decided to move all files to GPL
> 2 (if possible).
> 
> At the same time let's move to SPDX identifiers as they are much nicer
> to read.
> 
> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
> ---
>  s390x/cmm.c       | 4 +---
>  s390x/cpumodel.c  | 4 +---
>  s390x/css.c       | 4 +---
>  s390x/cstart64.S  | 4 +---
>  s390x/diag10.c    | 4 +---
>  s390x/diag288.c   | 4 +---
>  s390x/diag308.c   | 5 +----
>  s390x/emulator.c  | 4 +---
>  s390x/gs.c        | 4 +---
>  s390x/iep.c       | 4 +---
>  s390x/intercept.c | 4 +---
>  s390x/pfmf.c      | 4 +---
>  s390x/sclp.c      | 4 +---
>  s390x/selftest.c  | 4 +---
>  s390x/skey.c      | 4 +---
>  s390x/skrf.c      | 4 +---
>  s390x/smp.c       | 4 +---
>  s390x/sthyi.c     | 4 +---
>  s390x/sthyi.h     | 4 +---
>  s390x/stsi.c      | 4 +---
>  s390x/uv-guest.c  | 4 +---
>  s390x/vector.c    | 4 +---
>  22 files changed, 22 insertions(+), 67 deletions(-)

Reviewed-by: Thomas Huth <thuth@redhat.com>

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [kvm-unit-tests PATCH 2/2] s390x: lib: Move to GPL 2 and SPDX license identifiers
  2020-12-08 15:09 ` [kvm-unit-tests PATCH 2/2] s390x: lib: " Janosch Frank
@ 2020-12-08 15:21   ` Thomas Huth
  2020-12-09  9:15   ` David Hildenbrand
                     ` (2 subsequent siblings)
  3 siblings, 0 replies; 19+ messages in thread
From: Thomas Huth @ 2020-12-08 15:21 UTC (permalink / raw)
  To: Janosch Frank, kvm; +Cc: david, cohuck, linux-s390

On 08/12/2020 16.09, Janosch Frank wrote:
> In the past we had some issues when developers wanted to use code
> snippets or constants from the kernel in a test or in the library. To
> remedy that the s390x maintainers decided to move all files to GPL 2
> (if possible).
> 
> At the same time let's move to SPDX identifiers as they are much nicer
> to read.
> 
> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>

Reviewed-by: Thomas Huth <thuth@redhat.com>

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [kvm-unit-tests PATCH 0/2] s390x: Move from LGPL 2 to GPL 2
  2020-12-08 15:09 [kvm-unit-tests PATCH 0/2] s390x: Move from LGPL 2 to GPL 2 Janosch Frank
  2020-12-08 15:09 ` [kvm-unit-tests PATCH 1/2] s390x: Move to GPL 2 and SPDX license identifiers Janosch Frank
  2020-12-08 15:09 ` [kvm-unit-tests PATCH 2/2] s390x: lib: " Janosch Frank
@ 2020-12-09  9:01 ` Christian Borntraeger
  2020-12-09 10:16 ` Claudio Imbrenda
  2020-12-09 16:07 ` Janosch Frank
  4 siblings, 0 replies; 19+ messages in thread
From: Christian Borntraeger @ 2020-12-09  9:01 UTC (permalink / raw)
  To: Janosch Frank, kvm; +Cc: thuth, david, cohuck, linux-s390



On 08.12.20 16:09, Janosch Frank wrote:
> KVM and the KVM unit tests should be able to share code to improve
> development speed and the LGPL is currently preventing us from doing
> exactly that. Additionally we have a multitude of different licenses
> in s390x files: GPL 2 only, GPL 2 or greater, LGPL 2 and LGPL 2.1 or
> later.
> 
> This patch set tries to move the licenses to GPL 2 where
> possible. Also we introduce the SPDX identifiers so the file headers
> are more readable.
> 

Makes perfect sense.
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [kvm-unit-tests PATCH 1/2] s390x: Move to GPL 2 and SPDX license identifiers
  2020-12-08 15:09 ` [kvm-unit-tests PATCH 1/2] s390x: Move to GPL 2 and SPDX license identifiers Janosch Frank
  2020-12-08 15:14   ` Thomas Huth
@ 2020-12-09  9:12   ` David Hildenbrand
  2020-12-09  9:19     ` David Hildenbrand
  2020-12-09 11:01   ` Cornelia Huck
  2020-12-09 12:43   ` Pierre Morel
  3 siblings, 1 reply; 19+ messages in thread
From: David Hildenbrand @ 2020-12-09  9:12 UTC (permalink / raw)
  To: Janosch Frank, kvm; +Cc: thuth, cohuck, linux-s390

On 08.12.20 16:09, Janosch Frank wrote:
> In the past we had some issues when developers wanted to use code
> snippets or constants from the kernel in a test or in the library. To
> remedy that the s390x maintainers decided to move all files to GPL
> 2 (if possible).
> 
> At the same time let's move to SPDX identifiers as they are much nicer
> to read.
> 

If I am not wrong, your patch only replaces existing license text by
SPDX identifiers. So I find this commit message rather confusing. The
"at the same time" is actually the only thing that is being done - or am
I missing something important?

I wonder of we can just convert everything to GPL-2.0-or-later, the list
of people that contributed to most files is rather limited, so getting
most acks should be easy.

-- 
Thanks,

David / dhildenb

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [kvm-unit-tests PATCH 2/2] s390x: lib: Move to GPL 2 and SPDX license identifiers
  2020-12-08 15:09 ` [kvm-unit-tests PATCH 2/2] s390x: lib: " Janosch Frank
  2020-12-08 15:21   ` Thomas Huth
@ 2020-12-09  9:15   ` David Hildenbrand
  2020-12-09  9:46     ` Janosch Frank
  2020-12-09 11:03   ` Cornelia Huck
  2020-12-09 12:50   ` Pierre Morel
  3 siblings, 1 reply; 19+ messages in thread
From: David Hildenbrand @ 2020-12-09  9:15 UTC (permalink / raw)
  To: Janosch Frank, kvm; +Cc: thuth, cohuck, linux-s390

On 08.12.20 16:09, Janosch Frank wrote:
> In the past we had some issues when developers wanted to use code
> snippets or constants from the kernel in a test or in the library. To
> remedy that the s390x maintainers decided to move all files to GPL 2
> (if possible).
> 
> At the same time let's move to SPDX identifiers as they are much nicer
> to read.
> 
> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
> ---
>  lib/s390x/asm-offsets.c     | 4 +---
>  lib/s390x/asm/arch_def.h    | 4 +---
>  lib/s390x/asm/asm-offsets.h | 4 +---
>  lib/s390x/asm/barrier.h     | 4 +---
>  lib/s390x/asm/cpacf.h       | 1 +
>  lib/s390x/asm/facility.h    | 4 +---
>  lib/s390x/asm/float.h       | 4 +---
>  lib/s390x/asm/interrupt.h   | 4 +---
>  lib/s390x/asm/io.h          | 4 +---
>  lib/s390x/asm/mem.h         | 4 +---
>  lib/s390x/asm/page.h        | 4 +---
>  lib/s390x/asm/pgtable.h     | 4 +---
>  lib/s390x/asm/sigp.h        | 4 +---
>  lib/s390x/asm/spinlock.h    | 4 +---
>  lib/s390x/asm/stack.h       | 4 +---
>  lib/s390x/asm/time.h        | 4 +---
>  lib/s390x/css.h             | 4 +---
>  lib/s390x/css_dump.c        | 4 +---
>  lib/s390x/css_lib.c         | 4 +---
>  lib/s390x/interrupt.c       | 4 +---
>  lib/s390x/io.c              | 4 +---
>  lib/s390x/mmu.c             | 4 +---
>  lib/s390x/mmu.h             | 4 +---
>  lib/s390x/sclp-console.c    | 5 +----
>  lib/s390x/sclp.c            | 4 +---
>  lib/s390x/sclp.h            | 5 +----
>  lib/s390x/smp.c             | 4 +---
>  lib/s390x/smp.h             | 4 +---
>  lib/s390x/stack.c           | 4 +---
>  lib/s390x/vm.c              | 3 +--
>  lib/s390x/vm.h              | 3 +--
>  31 files changed, 31 insertions(+), 90 deletions(-)
> 
> diff --git a/lib/s390x/asm-offsets.c b/lib/s390x/asm-offsets.c
> index 61d2658..ee94ed3 100644
> --- a/lib/s390x/asm-offsets.c
> +++ b/lib/s390x/asm-offsets.c
> @@ -1,11 +1,9 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
>  /*
>   * Copyright (c) 2017 Red Hat Inc
>   *
>   * Authors:
>   *  David Hildenbrand <david@redhat.com>
> - *
> - * This code is free software; you can redistribute it and/or modify it
> - * under the terms of the GNU Library General Public License version 2.
>   */
>  #include <libcflat.h>
>  #include <kbuild.h>
> diff --git a/lib/s390x/asm/arch_def.h b/lib/s390x/asm/arch_def.h
> index edc06ef..f3ab830 100644
> --- a/lib/s390x/asm/arch_def.h
> +++ b/lib/s390x/asm/arch_def.h
> @@ -1,11 +1,9 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
>  /*
>   * Copyright (c) 2017 Red Hat Inc
>   *
>   * Authors:
>   *  David Hildenbrand <david@redhat.com>
> - *
> - * This code is free software; you can redistribute it and/or modify it
> - * under the terms of the GNU Library General Public License version 2.
>   */
>  #ifndef _ASM_S390X_ARCH_DEF_H_
>  #define _ASM_S390X_ARCH_DEF_H_
> diff --git a/lib/s390x/asm/asm-offsets.h b/lib/s390x/asm/asm-offsets.h
> index a6d7af8..bed7f8e 100644
> --- a/lib/s390x/asm/asm-offsets.h
> +++ b/lib/s390x/asm/asm-offsets.h
> @@ -1,10 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
>  /*
>   * Copyright (c) 2017 Red Hat Inc
>   *
>   * Authors:
>   *  David Hildenbrand <david@redhat.com>
> - *
> - * This code is free software; you can redistribute it and/or modify it
> - * under the terms of the GNU Library General Public License version 2.
>   */
>  #include <generated/asm-offsets.h>
> diff --git a/lib/s390x/asm/barrier.h b/lib/s390x/asm/barrier.h
> index d862e78..8e2fd6d 100644
> --- a/lib/s390x/asm/barrier.h
> +++ b/lib/s390x/asm/barrier.h
> @@ -1,12 +1,10 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
>  /*
>   * Copyright (c) 2017 Red Hat Inc
>   *
>   * Authors:
>   *  Thomas Huth <thuth@redhat.com>
>   *  David Hildenbrand <david@redhat.com>
> - *
> - * This code is free software; you can redistribute it and/or modify it
> - * under the terms of the GNU Library General Public License version 2.
>   */
>  #ifndef _ASM_S390X_BARRIER_H_
>  #define _ASM_S390X_BARRIER_H_
> diff --git a/lib/s390x/asm/cpacf.h b/lib/s390x/asm/cpacf.h
> index 2146a01..805fcf1 100644
> --- a/lib/s390x/asm/cpacf.h
> +++ b/lib/s390x/asm/cpacf.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
>  /*
>   * CP Assist for Cryptographic Functions (CPACF)
>   *

This file was originally copied from Linux v4.13. So I'm wondering if
this should be

SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note

instead. Doesn't make a real difference in practice I guess?

-- 
Thanks,

David / dhildenb

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [kvm-unit-tests PATCH 1/2] s390x: Move to GPL 2 and SPDX license identifiers
  2020-12-09  9:12   ` David Hildenbrand
@ 2020-12-09  9:19     ` David Hildenbrand
  2020-12-09  9:49       ` Janosch Frank
  0 siblings, 1 reply; 19+ messages in thread
From: David Hildenbrand @ 2020-12-09  9:19 UTC (permalink / raw)
  To: Janosch Frank, kvm; +Cc: thuth, cohuck, linux-s390

On 09.12.20 10:12, David Hildenbrand wrote:
> On 08.12.20 16:09, Janosch Frank wrote:
>> In the past we had some issues when developers wanted to use code
>> snippets or constants from the kernel in a test or in the library. To
>> remedy that the s390x maintainers decided to move all files to GPL
>> 2 (if possible).
>>
>> At the same time let's move to SPDX identifiers as they are much nicer
>> to read.
>>
> 
> If I am not wrong, your patch only replaces existing license text by
> SPDX identifiers. So I find this commit message rather confusing. The
> "at the same time" is actually the only thing that is being done - or am
> I missing something important?
> 
> I wonder of we can just convert everything to GPL-2.0-or-later, the list
> of people that contributed to most files is rather limited, so getting
> most acks should be easy.
> 

Aehm, I missed the "Library" part :D

Acked-by: David Hildenbrand <david@redhat.com>

-- 
Thanks,

David / dhildenb

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [kvm-unit-tests PATCH 2/2] s390x: lib: Move to GPL 2 and SPDX license identifiers
  2020-12-09  9:15   ` David Hildenbrand
@ 2020-12-09  9:46     ` Janosch Frank
  2020-12-10 16:15       ` David Hildenbrand
  0 siblings, 1 reply; 19+ messages in thread
From: Janosch Frank @ 2020-12-09  9:46 UTC (permalink / raw)
  To: David Hildenbrand, kvm; +Cc: thuth, cohuck, linux-s390

On 12/9/20 10:15 AM, David Hildenbrand wrote:
> On 08.12.20 16:09, Janosch Frank wrote:
>> In the past we had some issues when developers wanted to use code
>> snippets or constants from the kernel in a test or in the library. To
>> remedy that the s390x maintainers decided to move all files to GPL 2
>> (if possible).
>>
>> At the same time let's move to SPDX identifiers as they are much nicer
>> to read.
>>
>> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
>> ---
>>  lib/s390x/asm-offsets.c     | 4 +---
>>  lib/s390x/asm/arch_def.h    | 4 +---
>>  lib/s390x/asm/asm-offsets.h | 4 +---
>>  lib/s390x/asm/barrier.h     | 4 +---
>>  lib/s390x/asm/cpacf.h       | 1 +
>>  lib/s390x/asm/facility.h    | 4 +---
>>  lib/s390x/asm/float.h       | 4 +---
>>  lib/s390x/asm/interrupt.h   | 4 +---
>>  lib/s390x/asm/io.h          | 4 +---
>>  lib/s390x/asm/mem.h         | 4 +---
>>  lib/s390x/asm/page.h        | 4 +---
>>  lib/s390x/asm/pgtable.h     | 4 +---
>>  lib/s390x/asm/sigp.h        | 4 +---
>>  lib/s390x/asm/spinlock.h    | 4 +---
>>  lib/s390x/asm/stack.h       | 4 +---
>>  lib/s390x/asm/time.h        | 4 +---
>>  lib/s390x/css.h             | 4 +---
>>  lib/s390x/css_dump.c        | 4 +---
>>  lib/s390x/css_lib.c         | 4 +---
>>  lib/s390x/interrupt.c       | 4 +---
>>  lib/s390x/io.c              | 4 +---
>>  lib/s390x/mmu.c             | 4 +---
>>  lib/s390x/mmu.h             | 4 +---
>>  lib/s390x/sclp-console.c    | 5 +----
>>  lib/s390x/sclp.c            | 4 +---
>>  lib/s390x/sclp.h            | 5 +----
>>  lib/s390x/smp.c             | 4 +---
>>  lib/s390x/smp.h             | 4 +---
>>  lib/s390x/stack.c           | 4 +---
>>  lib/s390x/vm.c              | 3 +--
>>  lib/s390x/vm.h              | 3 +--
>>  31 files changed, 31 insertions(+), 90 deletions(-)
>>
>> diff --git a/lib/s390x/asm-offsets.c b/lib/s390x/asm-offsets.c
>> index 61d2658..ee94ed3 100644
>> --- a/lib/s390x/asm-offsets.c
>> +++ b/lib/s390x/asm-offsets.c
>> @@ -1,11 +1,9 @@
>> +/* SPDX-License-Identifier: GPL-2.0-only */
>>  /*
>>   * Copyright (c) 2017 Red Hat Inc
>>   *
>>   * Authors:
>>   *  David Hildenbrand <david@redhat.com>
>> - *
>> - * This code is free software; you can redistribute it and/or modify it
>> - * under the terms of the GNU Library General Public License version 2.
>>   */
>>  #include <libcflat.h>
>>  #include <kbuild.h>
>> diff --git a/lib/s390x/asm/arch_def.h b/lib/s390x/asm/arch_def.h
>> index edc06ef..f3ab830 100644
>> --- a/lib/s390x/asm/arch_def.h
>> +++ b/lib/s390x/asm/arch_def.h
>> @@ -1,11 +1,9 @@
>> +/* SPDX-License-Identifier: GPL-2.0-only */
>>  /*
>>   * Copyright (c) 2017 Red Hat Inc
>>   *
>>   * Authors:
>>   *  David Hildenbrand <david@redhat.com>
>> - *
>> - * This code is free software; you can redistribute it and/or modify it
>> - * under the terms of the GNU Library General Public License version 2.
>>   */
>>  #ifndef _ASM_S390X_ARCH_DEF_H_
>>  #define _ASM_S390X_ARCH_DEF_H_
>> diff --git a/lib/s390x/asm/asm-offsets.h b/lib/s390x/asm/asm-offsets.h
>> index a6d7af8..bed7f8e 100644
>> --- a/lib/s390x/asm/asm-offsets.h
>> +++ b/lib/s390x/asm/asm-offsets.h
>> @@ -1,10 +1,8 @@
>> +/* SPDX-License-Identifier: GPL-2.0-only */
>>  /*
>>   * Copyright (c) 2017 Red Hat Inc
>>   *
>>   * Authors:
>>   *  David Hildenbrand <david@redhat.com>
>> - *
>> - * This code is free software; you can redistribute it and/or modify it
>> - * under the terms of the GNU Library General Public License version 2.
>>   */
>>  #include <generated/asm-offsets.h>
>> diff --git a/lib/s390x/asm/barrier.h b/lib/s390x/asm/barrier.h
>> index d862e78..8e2fd6d 100644
>> --- a/lib/s390x/asm/barrier.h
>> +++ b/lib/s390x/asm/barrier.h
>> @@ -1,12 +1,10 @@
>> +/* SPDX-License-Identifier: GPL-2.0-only */
>>  /*
>>   * Copyright (c) 2017 Red Hat Inc
>>   *
>>   * Authors:
>>   *  Thomas Huth <thuth@redhat.com>
>>   *  David Hildenbrand <david@redhat.com>
>> - *
>> - * This code is free software; you can redistribute it and/or modify it
>> - * under the terms of the GNU Library General Public License version 2.
>>   */
>>  #ifndef _ASM_S390X_BARRIER_H_
>>  #define _ASM_S390X_BARRIER_H_
>> diff --git a/lib/s390x/asm/cpacf.h b/lib/s390x/asm/cpacf.h
>> index 2146a01..805fcf1 100644
>> --- a/lib/s390x/asm/cpacf.h
>> +++ b/lib/s390x/asm/cpacf.h
>> @@ -1,3 +1,4 @@
>> +/* SPDX-License-Identifier: GPL-2.0-only */
>>  /*
>>   * CP Assist for Cryptographic Functions (CPACF)
>>   *
> 
> This file was originally copied from Linux v4.13. So I'm wondering if
> this should be
> 
> SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
> 
> instead. Doesn't make a real difference in practice I guess?
> 
Linux's arch/s390/include/asm/cpacf.h has the GPL-2.0 identifier, so why
do you want the syscall note?

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [kvm-unit-tests PATCH 1/2] s390x: Move to GPL 2 and SPDX license identifiers
  2020-12-09  9:19     ` David Hildenbrand
@ 2020-12-09  9:49       ` Janosch Frank
  0 siblings, 0 replies; 19+ messages in thread
From: Janosch Frank @ 2020-12-09  9:49 UTC (permalink / raw)
  To: David Hildenbrand, kvm; +Cc: thuth, cohuck, linux-s390


[-- Attachment #1.1.1: Type: text/plain, Size: 1259 bytes --]

On 12/9/20 10:19 AM, David Hildenbrand wrote:
> On 09.12.20 10:12, David Hildenbrand wrote:
>> On 08.12.20 16:09, Janosch Frank wrote:
>>> In the past we had some issues when developers wanted to use code
>>> snippets or constants from the kernel in a test or in the library. To
>>> remedy that the s390x maintainers decided to move all files to GPL
>>> 2 (if possible).
>>>
>>> At the same time let's move to SPDX identifiers as they are much nicer
>>> to read.
>>>
>>
>> If I am not wrong, your patch only replaces existing license text by
>> SPDX identifiers. So I find this commit message rather confusing. The
>> "at the same time" is actually the only thing that is being done - or am
>> I missing something important?
>>
>> I wonder of we can just convert everything to GPL-2.0-or-later, the list
>> of people that contributed to most files is rather limited, so getting
>> most acks should be easy.
>>
> 
> Aehm, I missed the "Library" part :D

If you look closely I remove the LGPL license blob and add a GPL2 SPDX
identifier. One more reason to move to SPDX, the license blobs are hard
to read as they are very similar until you come to the (L)GPL part.

> 
> Acked-by: David Hildenbrand <david@redhat.com>

Thanks


[-- Attachment #1.1.2: OpenPGP_0xE354E6B8E238B9F8.asc --]
[-- Type: application/pgp-keys, Size: 7995 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [kvm-unit-tests PATCH 0/2] s390x: Move from LGPL 2 to GPL 2
  2020-12-08 15:09 [kvm-unit-tests PATCH 0/2] s390x: Move from LGPL 2 to GPL 2 Janosch Frank
                   ` (2 preceding siblings ...)
  2020-12-09  9:01 ` [kvm-unit-tests PATCH 0/2] s390x: Move from LGPL 2 to GPL 2 Christian Borntraeger
@ 2020-12-09 10:16 ` Claudio Imbrenda
  2020-12-09 16:07 ` Janosch Frank
  4 siblings, 0 replies; 19+ messages in thread
From: Claudio Imbrenda @ 2020-12-09 10:16 UTC (permalink / raw)
  To: Janosch Frank; +Cc: kvm, thuth, david, cohuck, linux-s390

On Tue,  8 Dec 2020 10:09:00 -0500
Janosch Frank <frankja@linux.ibm.com> wrote:

> KVM and the KVM unit tests should be able to share code to improve
> development speed and the LGPL is currently preventing us from doing
> exactly that. Additionally we have a multitude of different licenses
> in s390x files: GPL 2 only, GPL 2 or greater, LGPL 2 and LGPL 2.1 or
> later.
> 
> This patch set tries to move the licenses to GPL 2 where
> possible. Also we introduce the SPDX identifiers so the file headers
> are more readable.

whole series:

Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
 
> Janosch Frank (2):
>   s390x: Move to GPL 2 and SPDX license identifiers
>   s390x: lib: Move to GPL 2 and SPDX license identifiers
> 
>  lib/s390x/asm-offsets.c     | 4 +---
>  lib/s390x/asm/arch_def.h    | 4 +---
>  lib/s390x/asm/asm-offsets.h | 4 +---
>  lib/s390x/asm/barrier.h     | 4 +---
>  lib/s390x/asm/cpacf.h       | 1 +
>  lib/s390x/asm/facility.h    | 4 +---
>  lib/s390x/asm/float.h       | 4 +---
>  lib/s390x/asm/interrupt.h   | 4 +---
>  lib/s390x/asm/io.h          | 4 +---
>  lib/s390x/asm/mem.h         | 4 +---
>  lib/s390x/asm/page.h        | 4 +---
>  lib/s390x/asm/pgtable.h     | 4 +---
>  lib/s390x/asm/sigp.h        | 4 +---
>  lib/s390x/asm/spinlock.h    | 4 +---
>  lib/s390x/asm/stack.h       | 4 +---
>  lib/s390x/asm/time.h        | 4 +---
>  lib/s390x/css.h             | 4 +---
>  lib/s390x/css_dump.c        | 4 +---
>  lib/s390x/css_lib.c         | 4 +---
>  lib/s390x/interrupt.c       | 4 +---
>  lib/s390x/io.c              | 4 +---
>  lib/s390x/mmu.c             | 4 +---
>  lib/s390x/mmu.h             | 4 +---
>  lib/s390x/sclp-console.c    | 5 +----
>  lib/s390x/sclp.c            | 4 +---
>  lib/s390x/sclp.h            | 5 +----
>  lib/s390x/smp.c             | 4 +---
>  lib/s390x/smp.h             | 4 +---
>  lib/s390x/stack.c           | 4 +---
>  lib/s390x/vm.c              | 3 +--
>  lib/s390x/vm.h              | 3 +--
>  s390x/cmm.c                 | 4 +---
>  s390x/cpumodel.c            | 4 +---
>  s390x/css.c                 | 4 +---
>  s390x/cstart64.S            | 4 +---
>  s390x/diag10.c              | 4 +---
>  s390x/diag288.c             | 4 +---
>  s390x/diag308.c             | 5 +----
>  s390x/emulator.c            | 4 +---
>  s390x/gs.c                  | 4 +---
>  s390x/iep.c                 | 4 +---
>  s390x/intercept.c           | 4 +---
>  s390x/pfmf.c                | 4 +---
>  s390x/sclp.c                | 4 +---
>  s390x/selftest.c            | 4 +---
>  s390x/skey.c                | 4 +---
>  s390x/skrf.c                | 4 +---
>  s390x/smp.c                 | 4 +---
>  s390x/sthyi.c               | 4 +---
>  s390x/sthyi.h               | 4 +---
>  s390x/stsi.c                | 4 +---
>  s390x/uv-guest.c            | 4 +---
>  s390x/vector.c              | 4 +---
>  53 files changed, 53 insertions(+), 157 deletions(-)
> 

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [kvm-unit-tests PATCH 1/2] s390x: Move to GPL 2 and SPDX license identifiers
  2020-12-08 15:09 ` [kvm-unit-tests PATCH 1/2] s390x: Move to GPL 2 and SPDX license identifiers Janosch Frank
  2020-12-08 15:14   ` Thomas Huth
  2020-12-09  9:12   ` David Hildenbrand
@ 2020-12-09 11:01   ` Cornelia Huck
  2020-12-09 12:43   ` Pierre Morel
  3 siblings, 0 replies; 19+ messages in thread
From: Cornelia Huck @ 2020-12-09 11:01 UTC (permalink / raw)
  To: Janosch Frank; +Cc: kvm, thuth, david, linux-s390

On Tue,  8 Dec 2020 10:09:01 -0500
Janosch Frank <frankja@linux.ibm.com> wrote:

> In the past we had some issues when developers wanted to use code
> snippets or constants from the kernel in a test or in the library. To
> remedy that the s390x maintainers decided to move all files to GPL
> 2 (if possible).
> 
> At the same time let's move to SPDX identifiers as they are much nicer
> to read.
> 
> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
> ---
>  s390x/cmm.c       | 4 +---
>  s390x/cpumodel.c  | 4 +---
>  s390x/css.c       | 4 +---
>  s390x/cstart64.S  | 4 +---
>  s390x/diag10.c    | 4 +---
>  s390x/diag288.c   | 4 +---
>  s390x/diag308.c   | 5 +----
>  s390x/emulator.c  | 4 +---
>  s390x/gs.c        | 4 +---
>  s390x/iep.c       | 4 +---
>  s390x/intercept.c | 4 +---
>  s390x/pfmf.c      | 4 +---
>  s390x/sclp.c      | 4 +---
>  s390x/selftest.c  | 4 +---
>  s390x/skey.c      | 4 +---
>  s390x/skrf.c      | 4 +---
>  s390x/smp.c       | 4 +---
>  s390x/sthyi.c     | 4 +---
>  s390x/sthyi.h     | 4 +---
>  s390x/stsi.c      | 4 +---
>  s390x/uv-guest.c  | 4 +---
>  s390x/vector.c    | 4 +---
>  22 files changed, 22 insertions(+), 67 deletions(-)

Yeah for SPDX!

Reviewed-by: Cornelia Huck <cohuck@redhat.com>

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [kvm-unit-tests PATCH 2/2] s390x: lib: Move to GPL 2 and SPDX license identifiers
  2020-12-08 15:09 ` [kvm-unit-tests PATCH 2/2] s390x: lib: " Janosch Frank
  2020-12-08 15:21   ` Thomas Huth
  2020-12-09  9:15   ` David Hildenbrand
@ 2020-12-09 11:03   ` Cornelia Huck
  2020-12-09 12:50   ` Pierre Morel
  3 siblings, 0 replies; 19+ messages in thread
From: Cornelia Huck @ 2020-12-09 11:03 UTC (permalink / raw)
  To: Janosch Frank; +Cc: kvm, thuth, david, linux-s390

On Tue,  8 Dec 2020 10:09:02 -0500
Janosch Frank <frankja@linux.ibm.com> wrote:

> In the past we had some issues when developers wanted to use code
> snippets or constants from the kernel in a test or in the library. To
> remedy that the s390x maintainers decided to move all files to GPL 2
> (if possible).
> 
> At the same time let's move to SPDX identifiers as they are much nicer
> to read.
> 
> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
> ---
>  lib/s390x/asm-offsets.c     | 4 +---
>  lib/s390x/asm/arch_def.h    | 4 +---
>  lib/s390x/asm/asm-offsets.h | 4 +---
>  lib/s390x/asm/barrier.h     | 4 +---
>  lib/s390x/asm/cpacf.h       | 1 +
>  lib/s390x/asm/facility.h    | 4 +---
>  lib/s390x/asm/float.h       | 4 +---
>  lib/s390x/asm/interrupt.h   | 4 +---
>  lib/s390x/asm/io.h          | 4 +---
>  lib/s390x/asm/mem.h         | 4 +---
>  lib/s390x/asm/page.h        | 4 +---
>  lib/s390x/asm/pgtable.h     | 4 +---
>  lib/s390x/asm/sigp.h        | 4 +---
>  lib/s390x/asm/spinlock.h    | 4 +---
>  lib/s390x/asm/stack.h       | 4 +---
>  lib/s390x/asm/time.h        | 4 +---
>  lib/s390x/css.h             | 4 +---
>  lib/s390x/css_dump.c        | 4 +---
>  lib/s390x/css_lib.c         | 4 +---
>  lib/s390x/interrupt.c       | 4 +---
>  lib/s390x/io.c              | 4 +---
>  lib/s390x/mmu.c             | 4 +---
>  lib/s390x/mmu.h             | 4 +---
>  lib/s390x/sclp-console.c    | 5 +----
>  lib/s390x/sclp.c            | 4 +---
>  lib/s390x/sclp.h            | 5 +----
>  lib/s390x/smp.c             | 4 +---
>  lib/s390x/smp.h             | 4 +---
>  lib/s390x/stack.c           | 4 +---
>  lib/s390x/vm.c              | 3 +--
>  lib/s390x/vm.h              | 3 +--
>  31 files changed, 31 insertions(+), 90 deletions(-)

Reviewed-by: Cornelia Huck <cohuck@redhat.com>

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [kvm-unit-tests PATCH 1/2] s390x: Move to GPL 2 and SPDX license identifiers
  2020-12-08 15:09 ` [kvm-unit-tests PATCH 1/2] s390x: Move to GPL 2 and SPDX license identifiers Janosch Frank
                     ` (2 preceding siblings ...)
  2020-12-09 11:01   ` Cornelia Huck
@ 2020-12-09 12:43   ` Pierre Morel
  3 siblings, 0 replies; 19+ messages in thread
From: Pierre Morel @ 2020-12-09 12:43 UTC (permalink / raw)
  To: Janosch Frank, kvm; +Cc: thuth, david, cohuck, linux-s390



On 12/8/20 4:09 PM, Janosch Frank wrote:
> In the past we had some issues when developers wanted to use code
> snippets or constants from the kernel in a test or in the library. To
> remedy that the s390x maintainers decided to move all files to GPL
> 2 (if possible).
> 
> At the same time let's move to SPDX identifiers as they are much nicer
> to read.
> 
> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
> ---
>   s390x/cmm.c       | 4 +---
>   s390x/cpumodel.c  | 4 +---
>   s390x/css.c       | 4 +---
>   s390x/cstart64.S  | 4 +---
>   s390x/diag10.c    | 4 +---
>   s390x/diag288.c   | 4 +---
>   s390x/diag308.c   | 5 +----
>   s390x/emulator.c  | 4 +---
>   s390x/gs.c        | 4 +---
>   s390x/iep.c       | 4 +---
>   s390x/intercept.c | 4 +---
>   s390x/pfmf.c      | 4 +---
>   s390x/sclp.c      | 4 +---
>   s390x/selftest.c  | 4 +---
>   s390x/skey.c      | 4 +---
>   s390x/skrf.c      | 4 +---
>   s390x/smp.c       | 4 +---
>   s390x/sthyi.c     | 4 +---
>   s390x/sthyi.h     | 4 +---
>   s390x/stsi.c      | 4 +---
>   s390x/uv-guest.c  | 4 +---
>   s390x/vector.c    | 4 +---
>   22 files changed, 22 insertions(+), 67 deletions(-)
> 

Acked-by: Pierre Morel <pmorel@linux.ibm.com>


-- 
Pierre Morel
IBM Lab Boeblingen

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [kvm-unit-tests PATCH 2/2] s390x: lib: Move to GPL 2 and SPDX license identifiers
  2020-12-08 15:09 ` [kvm-unit-tests PATCH 2/2] s390x: lib: " Janosch Frank
                     ` (2 preceding siblings ...)
  2020-12-09 11:03   ` Cornelia Huck
@ 2020-12-09 12:50   ` Pierre Morel
  3 siblings, 0 replies; 19+ messages in thread
From: Pierre Morel @ 2020-12-09 12:50 UTC (permalink / raw)
  To: Janosch Frank, kvm; +Cc: thuth, david, cohuck, linux-s390



On 12/8/20 4:09 PM, Janosch Frank wrote:
> In the past we had some issues when developers wanted to use code
> snippets or constants from the kernel in a test or in the library. To
> remedy that the s390x maintainers decided to move all files to GPL 2
> (if possible).
> 
> At the same time let's move to SPDX identifiers as they are much nicer
> to read.
> 
> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
> ---
>   lib/s390x/asm-offsets.c     | 4 +---
>   lib/s390x/asm/arch_def.h    | 4 +---
>   lib/s390x/asm/asm-offsets.h | 4 +---
>   lib/s390x/asm/barrier.h     | 4 +---
>   lib/s390x/asm/cpacf.h       | 1 +
>   lib/s390x/asm/facility.h    | 4 +---
>   lib/s390x/asm/float.h       | 4 +---
>   lib/s390x/asm/interrupt.h   | 4 +---
>   lib/s390x/asm/io.h          | 4 +---
>   lib/s390x/asm/mem.h         | 4 +---
>   lib/s390x/asm/page.h        | 4 +---
>   lib/s390x/asm/pgtable.h     | 4 +---
>   lib/s390x/asm/sigp.h        | 4 +---
>   lib/s390x/asm/spinlock.h    | 4 +---
>   lib/s390x/asm/stack.h       | 4 +---
>   lib/s390x/asm/time.h        | 4 +---
>   lib/s390x/css.h             | 4 +---
>   lib/s390x/css_dump.c        | 4 +---
>   lib/s390x/css_lib.c         | 4 +---
>   lib/s390x/interrupt.c       | 4 +---
>   lib/s390x/io.c              | 4 +---
>   lib/s390x/mmu.c             | 4 +---
>   lib/s390x/mmu.h             | 4 +---
>   lib/s390x/sclp-console.c    | 5 +----
>   lib/s390x/sclp.c            | 4 +---
>   lib/s390x/sclp.h            | 5 +----
>   lib/s390x/smp.c             | 4 +---
>   lib/s390x/smp.h             | 4 +---
>   lib/s390x/stack.c           | 4 +---
>   lib/s390x/vm.c              | 3 +--
>   lib/s390x/vm.h              | 3 +--
>   31 files changed, 31 insertions(+), 90 deletions(-)
> 

Acked-by: Pierre Morel <pmorel@linux.ibm.com>

-- 
Pierre Morel
IBM Lab Boeblingen

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [kvm-unit-tests PATCH 0/2] s390x: Move from LGPL 2 to GPL 2
  2020-12-08 15:09 [kvm-unit-tests PATCH 0/2] s390x: Move from LGPL 2 to GPL 2 Janosch Frank
                   ` (3 preceding siblings ...)
  2020-12-09 10:16 ` Claudio Imbrenda
@ 2020-12-09 16:07 ` Janosch Frank
  4 siblings, 0 replies; 19+ messages in thread
From: Janosch Frank @ 2020-12-09 16:07 UTC (permalink / raw)
  To: kvm; +Cc: thuth, david, cohuck, linux-s390


[-- Attachment #1.1.1: Type: text/plain, Size: 2944 bytes --]

On 12/8/20 4:09 PM, Janosch Frank wrote:
> KVM and the KVM unit tests should be able to share code to improve
> development speed and the LGPL is currently preventing us from doing
> exactly that. Additionally we have a multitude of different licenses
> in s390x files: GPL 2 only, GPL 2 or greater, LGPL 2 and LGPL 2.1 or
> later.
> 
> This patch set tries to move the licenses to GPL 2 where
> possible. Also we introduce the SPDX identifiers so the file headers
> are more readable.

Thanks for all the Acks / Reviews.

Patches have been queued.

> 
> Janosch Frank (2):
>   s390x: Move to GPL 2 and SPDX license identifiers
>   s390x: lib: Move to GPL 2 and SPDX license identifiers
> 
>  lib/s390x/asm-offsets.c     | 4 +---
>  lib/s390x/asm/arch_def.h    | 4 +---
>  lib/s390x/asm/asm-offsets.h | 4 +---
>  lib/s390x/asm/barrier.h     | 4 +---
>  lib/s390x/asm/cpacf.h       | 1 +
>  lib/s390x/asm/facility.h    | 4 +---
>  lib/s390x/asm/float.h       | 4 +---
>  lib/s390x/asm/interrupt.h   | 4 +---
>  lib/s390x/asm/io.h          | 4 +---
>  lib/s390x/asm/mem.h         | 4 +---
>  lib/s390x/asm/page.h        | 4 +---
>  lib/s390x/asm/pgtable.h     | 4 +---
>  lib/s390x/asm/sigp.h        | 4 +---
>  lib/s390x/asm/spinlock.h    | 4 +---
>  lib/s390x/asm/stack.h       | 4 +---
>  lib/s390x/asm/time.h        | 4 +---
>  lib/s390x/css.h             | 4 +---
>  lib/s390x/css_dump.c        | 4 +---
>  lib/s390x/css_lib.c         | 4 +---
>  lib/s390x/interrupt.c       | 4 +---
>  lib/s390x/io.c              | 4 +---
>  lib/s390x/mmu.c             | 4 +---
>  lib/s390x/mmu.h             | 4 +---
>  lib/s390x/sclp-console.c    | 5 +----
>  lib/s390x/sclp.c            | 4 +---
>  lib/s390x/sclp.h            | 5 +----
>  lib/s390x/smp.c             | 4 +---
>  lib/s390x/smp.h             | 4 +---
>  lib/s390x/stack.c           | 4 +---
>  lib/s390x/vm.c              | 3 +--
>  lib/s390x/vm.h              | 3 +--
>  s390x/cmm.c                 | 4 +---
>  s390x/cpumodel.c            | 4 +---
>  s390x/css.c                 | 4 +---
>  s390x/cstart64.S            | 4 +---
>  s390x/diag10.c              | 4 +---
>  s390x/diag288.c             | 4 +---
>  s390x/diag308.c             | 5 +----
>  s390x/emulator.c            | 4 +---
>  s390x/gs.c                  | 4 +---
>  s390x/iep.c                 | 4 +---
>  s390x/intercept.c           | 4 +---
>  s390x/pfmf.c                | 4 +---
>  s390x/sclp.c                | 4 +---
>  s390x/selftest.c            | 4 +---
>  s390x/skey.c                | 4 +---
>  s390x/skrf.c                | 4 +---
>  s390x/smp.c                 | 4 +---
>  s390x/sthyi.c               | 4 +---
>  s390x/sthyi.h               | 4 +---
>  s390x/stsi.c                | 4 +---
>  s390x/uv-guest.c            | 4 +---
>  s390x/vector.c              | 4 +---
>  53 files changed, 53 insertions(+), 157 deletions(-)
> 


[-- Attachment #1.1.2: OpenPGP_0xE354E6B8E238B9F8.asc --]
[-- Type: application/pgp-keys, Size: 7995 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [kvm-unit-tests PATCH 2/2] s390x: lib: Move to GPL 2 and SPDX license identifiers
  2020-12-09  9:46     ` Janosch Frank
@ 2020-12-10 16:15       ` David Hildenbrand
  2020-12-10 16:20         ` Janosch Frank
  0 siblings, 1 reply; 19+ messages in thread
From: David Hildenbrand @ 2020-12-10 16:15 UTC (permalink / raw)
  To: Janosch Frank, kvm; +Cc: thuth, cohuck, linux-s390

On 09.12.20 10:46, Janosch Frank wrote:
> On 12/9/20 10:15 AM, David Hildenbrand wrote:
>> On 08.12.20 16:09, Janosch Frank wrote:
>>> In the past we had some issues when developers wanted to use code
>>> snippets or constants from the kernel in a test or in the library. To
>>> remedy that the s390x maintainers decided to move all files to GPL 2
>>> (if possible).
>>>
>>> At the same time let's move to SPDX identifiers as they are much nicer
>>> to read.
>>>
>>> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
>>> ---
>>>  lib/s390x/asm-offsets.c     | 4 +---
>>>  lib/s390x/asm/arch_def.h    | 4 +---
>>>  lib/s390x/asm/asm-offsets.h | 4 +---
>>>  lib/s390x/asm/barrier.h     | 4 +---
>>>  lib/s390x/asm/cpacf.h       | 1 +
>>>  lib/s390x/asm/facility.h    | 4 +---
>>>  lib/s390x/asm/float.h       | 4 +---
>>>  lib/s390x/asm/interrupt.h   | 4 +---
>>>  lib/s390x/asm/io.h          | 4 +---
>>>  lib/s390x/asm/mem.h         | 4 +---
>>>  lib/s390x/asm/page.h        | 4 +---
>>>  lib/s390x/asm/pgtable.h     | 4 +---
>>>  lib/s390x/asm/sigp.h        | 4 +---
>>>  lib/s390x/asm/spinlock.h    | 4 +---
>>>  lib/s390x/asm/stack.h       | 4 +---
>>>  lib/s390x/asm/time.h        | 4 +---
>>>  lib/s390x/css.h             | 4 +---
>>>  lib/s390x/css_dump.c        | 4 +---
>>>  lib/s390x/css_lib.c         | 4 +---
>>>  lib/s390x/interrupt.c       | 4 +---
>>>  lib/s390x/io.c              | 4 +---
>>>  lib/s390x/mmu.c             | 4 +---
>>>  lib/s390x/mmu.h             | 4 +---
>>>  lib/s390x/sclp-console.c    | 5 +----
>>>  lib/s390x/sclp.c            | 4 +---
>>>  lib/s390x/sclp.h            | 5 +----
>>>  lib/s390x/smp.c             | 4 +---
>>>  lib/s390x/smp.h             | 4 +---
>>>  lib/s390x/stack.c           | 4 +---
>>>  lib/s390x/vm.c              | 3 +--
>>>  lib/s390x/vm.h              | 3 +--
>>>  31 files changed, 31 insertions(+), 90 deletions(-)
>>>
>>> diff --git a/lib/s390x/asm-offsets.c b/lib/s390x/asm-offsets.c
>>> index 61d2658..ee94ed3 100644
>>> --- a/lib/s390x/asm-offsets.c
>>> +++ b/lib/s390x/asm-offsets.c
>>> @@ -1,11 +1,9 @@
>>> +/* SPDX-License-Identifier: GPL-2.0-only */
>>>  /*
>>>   * Copyright (c) 2017 Red Hat Inc
>>>   *
>>>   * Authors:
>>>   *  David Hildenbrand <david@redhat.com>
>>> - *
>>> - * This code is free software; you can redistribute it and/or modify it
>>> - * under the terms of the GNU Library General Public License version 2.
>>>   */
>>>  #include <libcflat.h>
>>>  #include <kbuild.h>
>>> diff --git a/lib/s390x/asm/arch_def.h b/lib/s390x/asm/arch_def.h
>>> index edc06ef..f3ab830 100644
>>> --- a/lib/s390x/asm/arch_def.h
>>> +++ b/lib/s390x/asm/arch_def.h
>>> @@ -1,11 +1,9 @@
>>> +/* SPDX-License-Identifier: GPL-2.0-only */
>>>  /*
>>>   * Copyright (c) 2017 Red Hat Inc
>>>   *
>>>   * Authors:
>>>   *  David Hildenbrand <david@redhat.com>
>>> - *
>>> - * This code is free software; you can redistribute it and/or modify it
>>> - * under the terms of the GNU Library General Public License version 2.
>>>   */
>>>  #ifndef _ASM_S390X_ARCH_DEF_H_
>>>  #define _ASM_S390X_ARCH_DEF_H_
>>> diff --git a/lib/s390x/asm/asm-offsets.h b/lib/s390x/asm/asm-offsets.h
>>> index a6d7af8..bed7f8e 100644
>>> --- a/lib/s390x/asm/asm-offsets.h
>>> +++ b/lib/s390x/asm/asm-offsets.h
>>> @@ -1,10 +1,8 @@
>>> +/* SPDX-License-Identifier: GPL-2.0-only */
>>>  /*
>>>   * Copyright (c) 2017 Red Hat Inc
>>>   *
>>>   * Authors:
>>>   *  David Hildenbrand <david@redhat.com>
>>> - *
>>> - * This code is free software; you can redistribute it and/or modify it
>>> - * under the terms of the GNU Library General Public License version 2.
>>>   */
>>>  #include <generated/asm-offsets.h>
>>> diff --git a/lib/s390x/asm/barrier.h b/lib/s390x/asm/barrier.h
>>> index d862e78..8e2fd6d 100644
>>> --- a/lib/s390x/asm/barrier.h
>>> +++ b/lib/s390x/asm/barrier.h
>>> @@ -1,12 +1,10 @@
>>> +/* SPDX-License-Identifier: GPL-2.0-only */
>>>  /*
>>>   * Copyright (c) 2017 Red Hat Inc
>>>   *
>>>   * Authors:
>>>   *  Thomas Huth <thuth@redhat.com>
>>>   *  David Hildenbrand <david@redhat.com>
>>> - *
>>> - * This code is free software; you can redistribute it and/or modify it
>>> - * under the terms of the GNU Library General Public License version 2.
>>>   */
>>>  #ifndef _ASM_S390X_BARRIER_H_
>>>  #define _ASM_S390X_BARRIER_H_
>>> diff --git a/lib/s390x/asm/cpacf.h b/lib/s390x/asm/cpacf.h
>>> index 2146a01..805fcf1 100644
>>> --- a/lib/s390x/asm/cpacf.h
>>> +++ b/lib/s390x/asm/cpacf.h
>>> @@ -1,3 +1,4 @@
>>> +/* SPDX-License-Identifier: GPL-2.0-only */
>>>  /*
>>>   * CP Assist for Cryptographic Functions (CPACF)
>>>   *
>>
>> This file was originally copied from Linux v4.13. So I'm wondering if
>> this should be
>>
>> SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
>>
>> instead. Doesn't make a real difference in practice I guess?
>>
> Linux's arch/s390/include/asm/cpacf.h has the GPL-2.0 identifier, so why
> do you want the syscall note?

When we copied it in v4.13, there was no such identifier.

The tag was added in v4.14

commit b24413180f5600bcb3bb70fbed5cf186b60864bd
Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date:   Wed Nov 1 15:07:57 2017 +0100

    License cleanup: add SPDX GPL-2.0 license identifier to files with
no license


So naive me checked COPYING and COPYING.new in v4.13 and spotted

The Linux Kernel is provided under:
	SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note


But as the tag was added in v4.14, GPL-2.0-only seems to be the right
thing to do I assume.


Acked-by: David Hildenbrand <david@redhat.com>


-- 
Thanks,

David / dhildenb

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: [kvm-unit-tests PATCH 2/2] s390x: lib: Move to GPL 2 and SPDX license identifiers
  2020-12-10 16:15       ` David Hildenbrand
@ 2020-12-10 16:20         ` Janosch Frank
  0 siblings, 0 replies; 19+ messages in thread
From: Janosch Frank @ 2020-12-10 16:20 UTC (permalink / raw)
  To: David Hildenbrand, kvm; +Cc: thuth, cohuck, linux-s390

On 12/10/20 5:15 PM, David Hildenbrand wrote:
> On 09.12.20 10:46, Janosch Frank wrote:
>> On 12/9/20 10:15 AM, David Hildenbrand wrote:
>>> On 08.12.20 16:09, Janosch Frank wrote:
>>>> In the past we had some issues when developers wanted to use code
>>>> snippets or constants from the kernel in a test or in the library. To
>>>> remedy that the s390x maintainers decided to move all files to GPL 2
>>>> (if possible).
>>>>
>>>> At the same time let's move to SPDX identifiers as they are much nicer
>>>> to read.
>>>>
>>>> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
>>>> ---
>>>>  lib/s390x/asm-offsets.c     | 4 +---
>>>>  lib/s390x/asm/arch_def.h    | 4 +---
>>>>  lib/s390x/asm/asm-offsets.h | 4 +---
>>>>  lib/s390x/asm/barrier.h     | 4 +---
>>>>  lib/s390x/asm/cpacf.h       | 1 +
>>>>  lib/s390x/asm/facility.h    | 4 +---
>>>>  lib/s390x/asm/float.h       | 4 +---
>>>>  lib/s390x/asm/interrupt.h   | 4 +---
>>>>  lib/s390x/asm/io.h          | 4 +---
>>>>  lib/s390x/asm/mem.h         | 4 +---
>>>>  lib/s390x/asm/page.h        | 4 +---
>>>>  lib/s390x/asm/pgtable.h     | 4 +---
>>>>  lib/s390x/asm/sigp.h        | 4 +---
>>>>  lib/s390x/asm/spinlock.h    | 4 +---
>>>>  lib/s390x/asm/stack.h       | 4 +---
>>>>  lib/s390x/asm/time.h        | 4 +---
>>>>  lib/s390x/css.h             | 4 +---
>>>>  lib/s390x/css_dump.c        | 4 +---
>>>>  lib/s390x/css_lib.c         | 4 +---
>>>>  lib/s390x/interrupt.c       | 4 +---
>>>>  lib/s390x/io.c              | 4 +---
>>>>  lib/s390x/mmu.c             | 4 +---
>>>>  lib/s390x/mmu.h             | 4 +---
>>>>  lib/s390x/sclp-console.c    | 5 +----
>>>>  lib/s390x/sclp.c            | 4 +---
>>>>  lib/s390x/sclp.h            | 5 +----
>>>>  lib/s390x/smp.c             | 4 +---
>>>>  lib/s390x/smp.h             | 4 +---
>>>>  lib/s390x/stack.c           | 4 +---
>>>>  lib/s390x/vm.c              | 3 +--
>>>>  lib/s390x/vm.h              | 3 +--
>>>>  31 files changed, 31 insertions(+), 90 deletions(-)
>>>>
>>>> diff --git a/lib/s390x/asm-offsets.c b/lib/s390x/asm-offsets.c
>>>> index 61d2658..ee94ed3 100644
>>>> --- a/lib/s390x/asm-offsets.c
>>>> +++ b/lib/s390x/asm-offsets.c
>>>> @@ -1,11 +1,9 @@
>>>> +/* SPDX-License-Identifier: GPL-2.0-only */
>>>>  /*
>>>>   * Copyright (c) 2017 Red Hat Inc
>>>>   *
>>>>   * Authors:
>>>>   *  David Hildenbrand <david@redhat.com>
>>>> - *
>>>> - * This code is free software; you can redistribute it and/or modify it
>>>> - * under the terms of the GNU Library General Public License version 2.
>>>>   */
>>>>  #include <libcflat.h>
>>>>  #include <kbuild.h>
>>>> diff --git a/lib/s390x/asm/arch_def.h b/lib/s390x/asm/arch_def.h
>>>> index edc06ef..f3ab830 100644
>>>> --- a/lib/s390x/asm/arch_def.h
>>>> +++ b/lib/s390x/asm/arch_def.h
>>>> @@ -1,11 +1,9 @@
>>>> +/* SPDX-License-Identifier: GPL-2.0-only */
>>>>  /*
>>>>   * Copyright (c) 2017 Red Hat Inc
>>>>   *
>>>>   * Authors:
>>>>   *  David Hildenbrand <david@redhat.com>
>>>> - *
>>>> - * This code is free software; you can redistribute it and/or modify it
>>>> - * under the terms of the GNU Library General Public License version 2.
>>>>   */
>>>>  #ifndef _ASM_S390X_ARCH_DEF_H_
>>>>  #define _ASM_S390X_ARCH_DEF_H_
>>>> diff --git a/lib/s390x/asm/asm-offsets.h b/lib/s390x/asm/asm-offsets.h
>>>> index a6d7af8..bed7f8e 100644
>>>> --- a/lib/s390x/asm/asm-offsets.h
>>>> +++ b/lib/s390x/asm/asm-offsets.h
>>>> @@ -1,10 +1,8 @@
>>>> +/* SPDX-License-Identifier: GPL-2.0-only */
>>>>  /*
>>>>   * Copyright (c) 2017 Red Hat Inc
>>>>   *
>>>>   * Authors:
>>>>   *  David Hildenbrand <david@redhat.com>
>>>> - *
>>>> - * This code is free software; you can redistribute it and/or modify it
>>>> - * under the terms of the GNU Library General Public License version 2.
>>>>   */
>>>>  #include <generated/asm-offsets.h>
>>>> diff --git a/lib/s390x/asm/barrier.h b/lib/s390x/asm/barrier.h
>>>> index d862e78..8e2fd6d 100644
>>>> --- a/lib/s390x/asm/barrier.h
>>>> +++ b/lib/s390x/asm/barrier.h
>>>> @@ -1,12 +1,10 @@
>>>> +/* SPDX-License-Identifier: GPL-2.0-only */
>>>>  /*
>>>>   * Copyright (c) 2017 Red Hat Inc
>>>>   *
>>>>   * Authors:
>>>>   *  Thomas Huth <thuth@redhat.com>
>>>>   *  David Hildenbrand <david@redhat.com>
>>>> - *
>>>> - * This code is free software; you can redistribute it and/or modify it
>>>> - * under the terms of the GNU Library General Public License version 2.
>>>>   */
>>>>  #ifndef _ASM_S390X_BARRIER_H_
>>>>  #define _ASM_S390X_BARRIER_H_
>>>> diff --git a/lib/s390x/asm/cpacf.h b/lib/s390x/asm/cpacf.h
>>>> index 2146a01..805fcf1 100644
>>>> --- a/lib/s390x/asm/cpacf.h
>>>> +++ b/lib/s390x/asm/cpacf.h
>>>> @@ -1,3 +1,4 @@
>>>> +/* SPDX-License-Identifier: GPL-2.0-only */
>>>>  /*
>>>>   * CP Assist for Cryptographic Functions (CPACF)
>>>>   *
>>>
>>> This file was originally copied from Linux v4.13. So I'm wondering if
>>> this should be
>>>
>>> SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
>>>
>>> instead. Doesn't make a real difference in practice I guess?
>>>
>> Linux's arch/s390/include/asm/cpacf.h has the GPL-2.0 identifier, so why
>> do you want the syscall note?
> 
> When we copied it in v4.13, there was no such identifier.
> 
> The tag was added in v4.14
> 
> commit b24413180f5600bcb3bb70fbed5cf186b60864bd
> Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Date:   Wed Nov 1 15:07:57 2017 +0100
> 
>     License cleanup: add SPDX GPL-2.0 license identifier to files with
> no license
> 
> 
> So naive me checked COPYING and COPYING.new in v4.13 and spotted
> 
> The Linux Kernel is provided under:
> 	SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
> 
> 
> But as the tag was added in v4.14, GPL-2.0-only seems to be the right
> thing to do I assume.

It's a bit sad that this is so complicated.
Thanks for looking

> 
> Acked-by: David Hildenbrand <david@redhat.com>
> 

Great, now we have all Acks together

^ permalink raw reply	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2020-12-10 16:21 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-08 15:09 [kvm-unit-tests PATCH 0/2] s390x: Move from LGPL 2 to GPL 2 Janosch Frank
2020-12-08 15:09 ` [kvm-unit-tests PATCH 1/2] s390x: Move to GPL 2 and SPDX license identifiers Janosch Frank
2020-12-08 15:14   ` Thomas Huth
2020-12-09  9:12   ` David Hildenbrand
2020-12-09  9:19     ` David Hildenbrand
2020-12-09  9:49       ` Janosch Frank
2020-12-09 11:01   ` Cornelia Huck
2020-12-09 12:43   ` Pierre Morel
2020-12-08 15:09 ` [kvm-unit-tests PATCH 2/2] s390x: lib: " Janosch Frank
2020-12-08 15:21   ` Thomas Huth
2020-12-09  9:15   ` David Hildenbrand
2020-12-09  9:46     ` Janosch Frank
2020-12-10 16:15       ` David Hildenbrand
2020-12-10 16:20         ` Janosch Frank
2020-12-09 11:03   ` Cornelia Huck
2020-12-09 12:50   ` Pierre Morel
2020-12-09  9:01 ` [kvm-unit-tests PATCH 0/2] s390x: Move from LGPL 2 to GPL 2 Christian Borntraeger
2020-12-09 10:16 ` Claudio Imbrenda
2020-12-09 16:07 ` Janosch Frank

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.