s390x: Move from LGPL 2 to GPL 2
cover s390x: Move from LGPL 2 to GPL 2
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(-)
Signature · 1 line
2.25.1
PATCH 1/2 s390x: Move to GPL 2 and SPDX license identifiers
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.
--- 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(-)
s390x/cmm.c +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * CMM tests (ESSA) *
@@ -5,9 +6,6 @@* * Authors: * Janosch Frank <[email protected]> -* -* 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>
s390x/cpumodel.c +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Test the known dependencies for facilities *
@@ -5,9 +6,6 @@* * Authors: * Christian Borntraeger <[email protected]> -* -* 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>
s390x/css.c +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Channel Subsystem tests *
@@ -5,9 +6,6 @@* * Authors: * Pierre Morel <[email protected]> -* -* 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>
s390x/cstart64.S +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * s390x startup code *
@@ -6,9 +7,6 @@ * Authors: * Thomas Huth <[email protected]> * David Hildenbrand <[email protected]> - * - * 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>
s390x/diag10.c +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Release pages hypercall tests (DIAG 10) *
@@ -5,9 +6,6 @@* * Authors: * Janosch Frank <[email protected]> -* -* 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>
s390x/diag288.c +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Timer Event DIAG288 test *
@@ -5,9 +6,6 @@* * Authors: * Janosch Frank <[email protected]> -* -* 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>
s390x/diag308.c +1 -4
@@ -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>
s390x/emulator.c +1 -3
@@ -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 <[email protected]> -* -* 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>
s390x/gs.c +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Tests guarded storage support. *
@@ -6,9 +7,6 @@* Authors: * Martin Schwidefsky <[email protected]> * Janosch Frank <[email protected]> -* -* 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>
s390x/iep.c +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Instruction Execution Prevention (IEP) DAT test. *
@@ -5,9 +6,6 @@* * Authors: * Janosch Frank <[email protected]> -* -* 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>
s390x/intercept.c +1 -3
@@ -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 <[email protected]> -* -* 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>
s390x/pfmf.c +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Perform Frame Management Function (pfmf) tests *
@@ -5,9 +6,6 @@* * Authors: * Janosch Frank <[email protected]> -* -* 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>
s390x/sclp.c +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Service Call tests *
@@ -5,9 +6,6 @@* * Authors: * Claudio Imbrenda <[email protected]> -* -* 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>
s390x/selftest.c +1 -3
@@ -1,12 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * Thomas Huth <[email protected]> * David Hildenbrand <[email protected]> -* -* 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>
s390x/skey.c +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Storage key tests *
@@ -5,9 +6,6 @@* * Authors: * Janosch Frank <[email protected]> -* -* 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>
s390x/skrf.c +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Storage key removal facility tests *
@@ -5,9 +6,6 @@* * Authors: * Janosch Frank <[email protected]> -* -* 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>
s390x/smp.c +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Tests sigp emulation *
@@ -5,9 +6,6 @@* * Authors: * Janosch Frank <[email protected]> -* -* 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>
s390x/sthyi.c +1 -3
@@ -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 <[email protected]> -* -* 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>
s390x/sthyi.h +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * STHYI related flags and structure definitions. *
@@ -5,9 +6,6 @@* * Authors: * Janosch Frank <[email protected]> -* -* 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_
s390x/stsi.c +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Store System Information tests *
@@ -5,9 +6,6 @@* * Authors: * Janosch Frank <[email protected]> -* -* 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>
s390x/uv-guest.c +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Guest Ultravisor Call tests *
@@ -5,9 +6,6 @@* * Authors: * Janosch Frank <[email protected]> -* -* 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>
s390x/vector.c +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Tests vector instruction support *
@@ -5,9 +6,6 @@* * Authors: * Janosch Frank <[email protected]> -* -* 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>
Signature · 1 line
2.25.1
Re: [kvm-unit-tests PATCH 1/2] s390x: Move to GPL 2 and SPDX license identifiers
Quoted 25 lines · Janosch Frank
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 <[email protected]>--- 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 +---
Quoted 8 lines
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(-)
Re: [kvm-unit-tests PATCH 1/2] s390x: Move to GPL 2 and SPDX license identifiers
In reply to Janosch FrankQuoted 8 lines · Janosch Frank
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.
Signature · 3 lines
Thanks, David / dhildenb
David Hildenbrand
Acked-byRe: [kvm-unit-tests PATCH 1/2] s390x: Move to GPL 2 and SPDX license identifiers
Quoted 10 lines · David Hildenbrand
Quoted 8 lines · Janosch Frank
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.
Quoted 9 lines
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
Signature · 3 lines
Thanks, David / dhildenb
Re: [kvm-unit-tests PATCH 1/2] s390x: Move to GPL 2 and SPDX license identifiers
Quoted 16 lines · David Hildenbrand
Quoted 15 lines · David Hildenbrand
Quoted 8 lines · Janosch Frank
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?
Quoted 6 lines
Quoted 4 lines
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.
Quoted 2 lines
Thanks
Re: [kvm-unit-tests PATCH 1/2] s390x: Move to GPL 2 and SPDX license identifiers
In reply to Janosch FrankQuoted 25 lines · On Tue, 8 Dec 2020 10:09:01 -0500 Janosch Frank <[email protected]> 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 <[email protected]>--- 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 +---
Quoted 8 lines
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!
Re: [kvm-unit-tests PATCH 1/2] s390x: Move to GPL 2 and SPDX license identifiers
In reply to Janosch FrankQuoted 25 lines · Janosch Frank
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 <[email protected]>--- 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 +---
Quoted 9 lines
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(-)
Signature · 2 lines
Pierre Morel IBM Lab Boeblingen
PATCH 2/2 s390x: lib: Move to GPL 2 and SPDX license identifiers
In reply to Janosch FrankIn 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.
--- 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(-)
lib/s390x/asm-offsets.c +1 -3
@@ -1,11 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * David Hildenbrand <[email protected]> -* -* 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>
lib/s390x/asm/arch_def.h +1 -3
@@ -1,11 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * David Hildenbrand <[email protected]> -* -* 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_
lib/s390x/asm/asm-offsets.h +1 -3
@@ -1,10 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * David Hildenbrand <[email protected]> -* -* 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>
lib/s390x/asm/barrier.h +1 -3
@@ -1,12 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * Thomas Huth <[email protected]> * David Hildenbrand <[email protected]> -* -* 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_
lib/s390x/asm/cpacf.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * CP Assist for Cryptographic Functions (CPACF) *
lib/s390x/asm/facility.h +1 -3
@@ -1,11 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * David Hildenbrand <[email protected]> -* -* 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_
lib/s390x/asm/float.h +1 -3
@@ -1,11 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2018 Red Hat Inc * * Authors: * David Hildenbrand <[email protected]> -* -* 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_
lib/s390x/asm/interrupt.h +1 -3
@@ -1,11 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * David Hildenbrand <[email protected]> -* -* 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_
lib/s390x/asm/io.h +1 -3
@@ -1,12 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * Thomas Huth <[email protected]> * David Hildenbrand <[email protected]> -* -* 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_
lib/s390x/asm/mem.h +1 -3
@@ -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 <[email protected]> -* -* 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
lib/s390x/asm/page.h +1 -3
@@ -1,12 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * Thomas Huth <[email protected]> * David Hildenbrand <[email protected]> -* -* 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_
lib/s390x/asm/pgtable.h +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * s390x page table definitions and functions *
@@ -5,9 +6,6 @@* * Authors: * David Hildenbrand <[email protected]> -* -* 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_
lib/s390x/asm/sigp.h +1 -3
@@ -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
lib/s390x/asm/spinlock.h +1 -3
@@ -1,12 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * Thomas Huth <[email protected]> * David Hildenbrand <[email protected]> -* -* 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
lib/s390x/asm/stack.h +1 -3
@@ -1,12 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * Thomas Huth <[email protected]> * David Hildenbrand <[email protected]> -* -* 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_
lib/s390x/asm/time.h +1 -3
@@ -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 <[email protected]> -* -* 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
lib/s390x/css.h +1 -3
@@ -1,11 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * CSS definitions * * Copyright IBM, Corp. 2020 * Author: Pierre Morel <[email protected]> -* -* 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
lib/s390x/css_dump.c +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Channel subsystem structures dumping *
@@ -6,9 +7,6 @@* Authors: * Pierre Morel <[email protected]> * -* 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
lib/s390x/css_lib.c +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Channel Subsystem tests library *
@@ -5,9 +6,6 @@* * Authors: * Pierre Morel <[email protected]> -* -* 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>
lib/s390x/interrupt.c +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * s390x interrupt handling *
@@ -5,9 +6,6 @@* * Authors: * David Hildenbrand <[email protected]> -* -* 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>
lib/s390x/io.c +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * s390x io implementation *
@@ -6,9 +7,6 @@* Authors: * Thomas Huth <[email protected]> * David Hildenbrand <[email protected]> -* -* 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>
lib/s390x/mmu.c +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * s390x MMU *
@@ -5,9 +6,6 @@* * Authors: * David Hildenbrand <[email protected]> -* -* 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>
lib/s390x/mmu.h +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * s390x mmu functions *
@@ -5,9 +6,6 @@* * Authors: * Janosch Frank <[email protected]> -* -* 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_
lib/s390x/sclp-console.c +1 -4
@@ -1,11 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only-or-later */ /* * SCLP ASCII access driver * * Copyright (c) 2013 Alexander Graf <[email protected]> -* -* 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>
lib/s390x/sclp.c +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * s390x SCLP driver *
@@ -5,9 +6,6 @@* * Authors: * David Hildenbrand <[email protected]> -* -* 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>
lib/s390x/sclp.h +1 -4
@@ -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 <[email protected]> -* -* 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
lib/s390x/smp.c +1 -3
@@ -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 <[email protected]> -* -* 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>
lib/s390x/smp.h +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * s390x smp *
@@ -5,9 +6,6 @@* * Authors: * Janosch Frank <[email protected]> -* -* 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
lib/s390x/stack.c +1 -3
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * s390x stack implementation *
@@ -6,9 +7,6 @@* Authors: * Thomas Huth <[email protected]> * David Hildenbrand <[email protected]> -* -* 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>
lib/s390x/vm.c +1 -2
@@ -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 <[email protected]> -* -* SPDX-License-Identifier: LGPL-2.1-or-later */ #include <libcflat.h>
lib/s390x/vm.h +1 -2
@@ -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
Signature · 1 line
2.25.1
Re: [kvm-unit-tests PATCH 2/2] s390x: lib: Move to GPL 2 and SPDX license identifiers
Quoted 9 lines · Janosch Frank
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 <[email protected]>
Re: [kvm-unit-tests PATCH 2/2] s390x: lib: Move to GPL 2 and SPDX license identifiers
In reply to Janosch FrankQuoted 116 lines · Janosch Frank
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 <[email protected]>--- 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(-)lib/s390x/asm-offsets.c +1
-3@@ -1,11 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * David Hildenbrand <[email protected]> -* -* 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> lib/s390x/asm/arch_def.h +1
-3@@ -1,11 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * David Hildenbrand <[email protected]> -* -* 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_lib/s390x/asm/asm-offsets.h +1
-3@@ -1,10 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * David Hildenbrand <[email protected]> -* -* 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> lib/s390x/asm/barrier.h +1
-3@@ -1,12 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * Thomas Huth <[email protected]> * David Hildenbrand <[email protected]> -* -* 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_lib/s390x/asm/cpacf.h +0
-0
lib/s390x/asm/cpacf.h line 4
Quoted 4 lines
lib/s390x/asm/cpacf.h +1
-0@@ -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?
Signature · 3 lines
Thanks, David / dhildenb
Re: [kvm-unit-tests PATCH 2/2] s390x: lib: Move to GPL 2 and SPDX license identifiers
Quoted 125 lines · David Hildenbrand
Quoted 116 lines · Janosch Frank
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 <[email protected]>--- 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(-)lib/s390x/asm-offsets.c +1
-3@@ -1,11 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * David Hildenbrand <[email protected]> -* -* 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> lib/s390x/asm/arch_def.h +1
-3@@ -1,11 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * David Hildenbrand <[email protected]> -* -* 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_lib/s390x/asm/asm-offsets.h +1
-3@@ -1,10 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * David Hildenbrand <[email protected]> -* -* 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> lib/s390x/asm/barrier.h +1
-3@@ -1,12 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * Thomas Huth <[email protected]> * David Hildenbrand <[email protected]> -* -* 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_lib/s390x/asm/cpacf.h +0
-0lib/s390x/asm/cpacf.h line 4
Quoted 4 lines
lib/s390x/asm/cpacf.h +1
-0@@ -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
Quoted 4 lines
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?
David Hildenbrand
Acked-byRe: [kvm-unit-tests PATCH 2/2] s390x: lib: Move to GPL 2 and SPDX license identifiers
Quoted 126 lines · Janosch Frank
Quoted 125 lines · David Hildenbrand
Quoted 116 lines · Janosch Frank
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 <[email protected]>--- 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(-)lib/s390x/asm-offsets.c +1
-3@@ -1,11 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * David Hildenbrand <[email protected]> -* -* 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> lib/s390x/asm/arch_def.h +1
-3@@ -1,11 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * David Hildenbrand <[email protected]> -* -* 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_lib/s390x/asm/asm-offsets.h +1
-3@@ -1,10 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * David Hildenbrand <[email protected]> -* -* 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> lib/s390x/asm/barrier.h +1
-3@@ -1,12 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * Thomas Huth <[email protected]> * David Hildenbrand <[email protected]> -* -* 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_lib/s390x/asm/cpacf.h +0
-0lib/s390x/asm/cpacf.h line 4
Quoted 4 lines
lib/s390x/asm/cpacf.h +1
-0@@ -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
Quoted 6 lines
Quoted 4 lines
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.hhas 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 <[email protected]> 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.
Signature · 3 lines
Thanks, David / dhildenb
Re: [kvm-unit-tests PATCH 2/2] s390x: lib: Move to GPL 2 and SPDX license identifiers
Quoted 146 lines · David Hildenbrand
Quoted 126 lines · Janosch Frank
Quoted 125 lines · David Hildenbrand
Quoted 116 lines · Janosch Frank
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 <[email protected]>--- 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(-)lib/s390x/asm-offsets.c +1
-3@@ -1,11 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * David Hildenbrand <[email protected]> -* -* 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> lib/s390x/asm/arch_def.h +1
-3@@ -1,11 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * David Hildenbrand <[email protected]> -* -* 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_lib/s390x/asm/asm-offsets.h +1
-3@@ -1,10 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * David Hildenbrand <[email protected]> -* -* 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> lib/s390x/asm/barrier.h +1
-3@@ -1,12 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2017 Red Hat Inc * * Authors: * Thomas Huth <[email protected]> * David Hildenbrand <[email protected]> -* -* 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_lib/s390x/asm/cpacf.h +0
-0lib/s390x/asm/cpacf.h line 4
Quoted 4 lines
lib/s390x/asm/cpacf.h +1
-0@@ -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
Quoted 6 lines
Quoted 4 lines
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.hhas 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
b24413180f5600bcb3bb70fbed5cf186b60864bdAuthor: Greg Kroah-Hartman <[email protected]> Date: Wed Nov 1 15:07:57 2017 +0100License cleanup: add SPDX GPL-2.0 license identifier to files with
no license
Quoted 8 lines
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-noteBut 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
Quoted 3 lines
Great, now we have all Acks together
Re: [kvm-unit-tests PATCH 2/2] s390x: lib: Move to GPL 2 and SPDX license identifiers
In reply to Janosch FrankQuoted 34 lines · On Tue, 8 Dec 2020 10:09:02 -0500 Janosch Frank <[email protected]> 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 <[email protected]>--- 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 +----
Quoted 8 lines
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(-)
Re: [kvm-unit-tests PATCH 2/2] s390x: lib: Move to GPL 2 and SPDX license identifiers
In reply to Janosch FrankQuoted 34 lines · Janosch Frank
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 <[email protected]>--- 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 +----
Quoted 9 lines
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(-)
Signature · 2 lines
Pierre Morel IBM Lab Boeblingen
Quoted 10 lines · Janosch Frank
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.
Quoted 9 lines · On Tue, 8 Dec 2020 10:09:00 -0500 Janosch Frank <[email protected]> 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:
Quoted 59 lines
Janosch Frank (2):
s390x: Move to GPL 2 and SPDX license identifiers
s390x: lib: Move to GPL 2 and SPDX license identifierslib/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(-)
Quoted 9 lines · Janosch Frank
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.
Quoted 60 lines
Janosch Frank (2):
s390x: Move to GPL 2 and SPDX license identifiers
s390x: lib: Move to GPL 2 and SPDX license identifierslib/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(-)