arch/s390/ license text cleanup
Subsystems (9)
cover arch/s390/ license text cleanup
Here are 12 patches against linux-next of today that add SPDX identifiers to the remaining files in arch/s390 that do not currently have them, and then it cleans up the various different ways that the license text boilerplate was written for the GPLv2 in a few files. This cleanup was done in the quest to remove the 700+ different ways the kernel describes GPLv2.
No copyright headers or any other non-license-description text was removed in these patches.
FWIW, this license cleanup action has been "blessed" by IBM lawyers, but feel free to check internally if you are curious.
Greg Kroah-Hartman (12):
s390: kernel: add SPDX identifiers to the remaining files
s390: kvm: add SPDX identifiers to the remaining files
s390: crypto: add SPDX identifiers to the remaining files
s390: mm: add SPDX identifiers to the remaining files
s390: pci: add SPDX identifiers to the remaining files
s390: appldata: add SPDX identifiers to the remaining files
s390: add SPDX identifiers to the remaining files
s390: kvm: Remove redundant license text
s390: kernel: Remove redundant license text
s390: include: Remove redundant license text
s390: crypto: Remove redundant license text
s390: Remove redundant license text
arch/s390/Makefile | 5 +---- arch/s390/appldata/appldata_base.c | 1 + arch/s390/appldata/appldata_mem.c | 1 + arch/s390/appldata/appldata_net_sum.c | 1 + arch/s390/appldata/appldata_os.c | 1 + arch/s390/boot/install.sh | 5 +---- arch/s390/crypto/aes_s390.c | 7 +------ arch/s390/crypto/arch_random.c | 6 +----- arch/s390/crypto/crc32-vx.c | 1 + arch/s390/crypto/des_s390.c | 7 +------ arch/s390/crypto/ghash_s390.c | 1 + arch/s390/crypto/paes_s390.c | 6 +----- arch/s390/crypto/prng.c | 1 + arch/s390/crypto/sha.h | 7 +------ arch/s390/crypto/sha256_s390.c | 7 +------ arch/s390/crypto/sha512_s390.c | 7 +------ arch/s390/crypto/sha_common.c | 7 +------ arch/s390/hypfs/inode.c | 2 +- arch/s390/include/asm/cpu_mf.h | 5 +---- arch/s390/include/asm/kprobes.h | 15 +-------------- arch/s390/include/asm/kvm_host.h | 5 +---- arch/s390/include/asm/kvm_para.h | 7 +------ arch/s390/include/asm/livepatch.h | 8 +------- arch/s390/include/asm/syscall.h | 5 +---- arch/s390/include/asm/sysinfo.h | 5 +---- arch/s390/include/uapi/asm/kvm.h | 4 ---- arch/s390/include/uapi/asm/kvm_para.h | 4 ---- arch/s390/include/uapi/asm/kvm_perf.h | 4 ---- arch/s390/include/uapi/asm/virtio-ccw.h | 4 ---- arch/s390/include/uapi/asm/zcrypt.h | 14 -------------- arch/s390/kernel/dis.c | 1 + arch/s390/kernel/dumpstack.c | 1 + arch/s390/kernel/ipl.c | 1 + arch/s390/kernel/kprobes.c | 15 +-------------- arch/s390/kernel/lgr.c | 1 + arch/s390/kernel/module.c | 15 +-------------- arch/s390/kernel/nmi.c | 1 + arch/s390/kernel/perf_cpum_cf.c | 5 +---- arch/s390/kernel/perf_cpum_sf.c | 5 +---- arch/s390/kernel/perf_event.c | 5 +---- arch/s390/kernel/setup.c | 1 + arch/s390/kernel/stacktrace.c | 1 + arch/s390/kernel/sthyi.c | 4 ---- arch/s390/kernel/time.c | 1 + arch/s390/kernel/topology.c | 1 + arch/s390/kernel/vdso.c | 5 +---- arch/s390/kernel/vdso32/clock_getres.S | 5 +---- arch/s390/kernel/vdso32/clock_gettime.S | 5 +---- arch/s390/kernel/vdso32/gettimeofday.S | 5 +---- arch/s390/kernel/vdso64/clock_getres.S | 5 +---- arch/s390/kernel/vdso64/clock_gettime.S | 5 +---- arch/s390/kernel/vdso64/gettimeofday.S | 5 +---- arch/s390/kernel/vtime.c | 1 + arch/s390/kvm/Makefile | 5 +---- arch/s390/kvm/diag.c | 5 +---- arch/s390/kvm/gaccess.h | 5 +---- arch/s390/kvm/guestdbg.c | 5 +---- arch/s390/kvm/intercept.c | 5 +---- arch/s390/kvm/interrupt.c | 5 +---- arch/s390/kvm/irq.h | 5 +---- arch/s390/kvm/kvm-s390.c | 5 +---- arch/s390/kvm/kvm-s390.h | 5 +---- arch/s390/kvm/priv.c | 5 +---- arch/s390/kvm/sigp.c | 5 +---- arch/s390/kvm/vsie.c | 5 +---- arch/s390/mm/cmm.c | 1 + arch/s390/mm/gmap.c | 1 + arch/s390/mm/mmap.c | 16 +--------------- arch/s390/mm/pgtable.c | 1 + arch/s390/pci/pci.c | 1 + arch/s390/pci/pci_debug.c | 1 + arch/s390/pci/pci_dma.c | 1 + arch/s390/pci/pci_insn.c | 1 + 73 files changed, 67 insertions(+), 263 deletions(-)
Signature · 1 line
2.15.0
PATCH 1/12 s390: kernel: add SPDX identifiers to the remaining files
It's good to have SPDX identifiers in all files to make it easier to audit the kernel tree for correct licenses.
Update the arch/s390/kernel/ files with the correct SPDX license identifier based on the license text in the file itself. The SPDX identifier is a legally binding shorthand, which can be used instead of the full boiler plate text.
This work is based on a script and data from Thomas Gleixner, Philippe Ombredanne, and Kate Stewart.
Cc Martin Schwidefsky <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
Cc Alexander Shishkin <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Kate Stewart <[email protected]>
Cc Philippe Ombredanne <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- arch/s390/kernel/dis.c | 1 + arch/s390/kernel/dumpstack.c | 1 + arch/s390/kernel/ipl.c | 1 + arch/s390/kernel/kprobes.c | 1 + arch/s390/kernel/lgr.c | 1 + arch/s390/kernel/module.c | 1 + arch/s390/kernel/nmi.c | 1 + arch/s390/kernel/perf_cpum_cf.c | 1 + arch/s390/kernel/perf_cpum_sf.c | 1 + arch/s390/kernel/perf_event.c | 1 + arch/s390/kernel/setup.c | 1 + arch/s390/kernel/stacktrace.c | 1 + arch/s390/kernel/time.c | 1 + arch/s390/kernel/topology.c | 1 + arch/s390/kernel/vdso.c | 1 + arch/s390/kernel/vdso32/clock_getres.S | 1 + arch/s390/kernel/vdso32/clock_gettime.S | 1 + arch/s390/kernel/vdso32/gettimeofday.S | 1 + arch/s390/kernel/vdso64/clock_getres.S | 1 + arch/s390/kernel/vdso64/clock_gettime.S | 1 + arch/s390/kernel/vdso64/gettimeofday.S | 1 + arch/s390/kernel/vtime.c | 1 + 22 files changed, 22 insertions(+)
arch/s390/kernel/dis.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Disassemble s390 instructions. *
arch/s390/kernel/dumpstack.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Stack dumping functions *
arch/s390/kernel/ipl.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * ipl/reipl/dump support for Linux on s390. *
arch/s390/kernel/kprobes.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Kernel Probes (KProbes) *
arch/s390/kernel/lgr.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Linux Guest Relocation (LGR) detection *
arch/s390/kernel/module.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Kernel module help for s390. *
arch/s390/kernel/nmi.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Machine check handler *
arch/s390/kernel/perf_cpum_cf.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Performance event support for s390x - CPU-measurement Counter Facility *
arch/s390/kernel/perf_cpum_sf.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Performance event support for the System z CPU-measurement Sampling Facility *
arch/s390/kernel/perf_event.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Performance event support for s390x *
arch/s390/kernel/setup.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * S390 version * Copyright IBM Corp. 1999, 2012
arch/s390/kernel/stacktrace.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Stack trace management functions *
arch/s390/kernel/time.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Time of day based timer functions. *
arch/s390/kernel/topology.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright IBM Corp. 2007, 2011 * Author(s): Heiko Carstens <[email protected]>
arch/s390/kernel/vdso.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * vdso setup for s390 *
arch/s390/kernel/vdso32/clock_getres.S +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Userland implementation of clock_getres() for 32 bits processes in a * s390 kernel for use in the vDSO
arch/s390/kernel/vdso32/clock_gettime.S +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Userland implementation of clock_gettime() for 32 bits processes in a * s390 kernel for use in the vDSO
arch/s390/kernel/vdso32/gettimeofday.S +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Userland implementation of gettimeofday() for 32 bits processes in a * s390 kernel for use in the vDSO
arch/s390/kernel/vdso64/clock_getres.S +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Userland implementation of clock_getres() for 64 bits processes in a * s390 kernel for use in the vDSO
arch/s390/kernel/vdso64/clock_gettime.S +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Userland implementation of clock_gettime() for 64 bits processes in a * s390 kernel for use in the vDSO
arch/s390/kernel/vdso64/gettimeofday.S +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Userland implementation of gettimeofday() for 64 bits processes in a * s390 kernel for use in the vDSO
arch/s390/kernel/vtime.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Virtual cpu timer based timer functions. *
Signature · 1 line
2.15.0
PATCH 2/12 s390: kvm: add SPDX identifiers to the remaining files
In reply to Greg Kroah-HartmanIt's good to have SPDX identifiers in all files to make it easier to audit the kernel tree for correct licenses.
Update the arch/s390/kvm/ files with the correct SPDX license identifier based on the license text in the file itself. The SPDX identifier is a legally binding shorthand, which can be used instead of the full boiler plate text.
This work is based on a script and data from Thomas Gleixner, Philippe Ombredanne, and Kate Stewart.
Cc Christian Borntraeger <[email protected]>
Cc Cornelia Huck <[email protected]>
Cc Martin Schwidefsky <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Kate Stewart <[email protected]>
Cc Philippe Ombredanne <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- arch/s390/kvm/Makefile | 1 + arch/s390/kvm/diag.c | 1 + arch/s390/kvm/gaccess.h | 1 + arch/s390/kvm/guestdbg.c | 1 + arch/s390/kvm/intercept.c | 1 + arch/s390/kvm/interrupt.c | 1 + arch/s390/kvm/irq.h | 1 + arch/s390/kvm/kvm-s390.c | 1 + arch/s390/kvm/kvm-s390.h | 1 + arch/s390/kvm/priv.c | 1 + arch/s390/kvm/sigp.c | 1 + arch/s390/kvm/vsie.c | 1 + 12 files changed, 12 insertions(+)
arch/s390/kvm/Makefile +1 -0
@@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # Makefile for kernel virtual machines on s390 # # Copyright IBM Corp. 2008
arch/s390/kvm/diag.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * handling diagnose instructions *
arch/s390/kvm/gaccess.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * access guest memory *
arch/s390/kvm/guestdbg.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * kvm guest debug support *
arch/s390/kvm/intercept.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * in-kernel handling for sie intercepts *
arch/s390/kvm/interrupt.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * handling kvm guest interrupts *
arch/s390/kvm/irq.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * s390 irqchip routines *
arch/s390/kvm/kvm-s390.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * hosting zSeries kernel virtual machines *
arch/s390/kvm/kvm-s390.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * definition for kvm on s390 *
arch/s390/kvm/priv.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * handling privileged instructions *
arch/s390/kvm/sigp.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * handling interprocessor communication *
arch/s390/kvm/vsie.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * kvm nested virtualization support for s390x *
Signature · 1 line
2.15.0
Re: [PATCH 02/12] s390: kvm: add SPDX identifiers to the remaining files
Quoted 19 lines · On Fri, 24 Nov 2017 15:00:33 +0100 Greg Kroah-Hartman…
It's good to have SPDX identifiers in all files to make it easier to audit the kernel tree for correct licenses.
Update the
arch/s390/kvm/files with the correct SPDX license identifier based on the license text in the file itself. The SPDX identifier is a legally binding shorthand, which can be used instead of the full boiler plate text.This work is based on a script and data from Thomas Gleixner, Philippe Ombredanne, and Kate Stewart.
Cc Christian Borntraeger <[email protected]>Cc Cornelia Huck <[email protected]>Cc Martin Schwidefsky <[email protected]>Cc Heiko Carstens <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Kate Stewart <[email protected]>Cc Philippe Ombredanne <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 14 lines
--- arch/s390/kvm/Makefile | 1 + arch/s390/kvm/diag.c | 1 + arch/s390/kvm/gaccess.h | 1 + arch/s390/kvm/guestdbg.c | 1 + arch/s390/kvm/intercept.c | 1 + arch/s390/kvm/interrupt.c | 1 + arch/s390/kvm/irq.h | 1 + arch/s390/kvm/kvm-s390.c | 1 + arch/s390/kvm/kvm-s390.h | 1 + arch/s390/kvm/priv.c | 1 + arch/s390/kvm/sigp.c | 1 + arch/s390/kvm/vsie.c | 1 + 12 files changed, 12 insertions(+)
Acked-by Cornelia Huck <[email protected]>
Re: [PATCH 02/12] s390: kvm: add SPDX identifiers to the remaining files
In reply to Greg Kroah-HartmanQuoted 19 lines · Greg Kroah-Hartman
It's good to have SPDX identifiers in all files to make it easier to audit the kernel tree for correct licenses.
Update the
arch/s390/kvm/files with the correct SPDX license identifier based on the license text in the file itself. The SPDX identifier is a legally binding shorthand, which can be used instead of the full boiler plate text.This work is based on a script and data from Thomas Gleixner, Philippe Ombredanne, and Kate Stewart.
Cc Christian Borntraeger <[email protected]>Cc Cornelia Huck <[email protected]>Cc Martin Schwidefsky <[email protected]>Cc Heiko Carstens <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Kate Stewart <[email protected]>Cc Philippe Ombredanne <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 14 lines
--- arch/s390/kvm/Makefile | 1 + arch/s390/kvm/diag.c | 1 + arch/s390/kvm/gaccess.h | 1 + arch/s390/kvm/guestdbg.c | 1 + arch/s390/kvm/intercept.c | 1 + arch/s390/kvm/interrupt.c | 1 + arch/s390/kvm/irq.h | 1 + arch/s390/kvm/kvm-s390.c | 1 + arch/s390/kvm/kvm-s390.h | 1 + arch/s390/kvm/priv.c | 1 + arch/s390/kvm/sigp.c | 1 + arch/s390/kvm/vsie.c | 1 + 12 files changed, 12 insertions(+)
thanks, queued for kvms390
PATCH 3/12 s390: crypto: add SPDX identifiers to the remaining files
In reply to Greg Kroah-HartmanIt's good to have SPDX identifiers in all files to make it easier to audit the kernel tree for correct licenses.
Update the arch/s390/crypto/ files with the correct SPDX license identifier based on the license text in the file itself. The SPDX identifier is a legally binding shorthand, which can be used instead of the full boiler plate text.
This work is based on a script and data from Thomas Gleixner, Philippe Ombredanne, and Kate Stewart.
Cc Herbert Xu <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Martin Schwidefsky <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Kate Stewart <[email protected]>
Cc Philippe Ombredanne <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- arch/s390/crypto/aes_s390.c | 1 + arch/s390/crypto/arch_random.c | 1 + arch/s390/crypto/crc32-vx.c | 1 + arch/s390/crypto/des_s390.c | 1 + arch/s390/crypto/ghash_s390.c | 1 + arch/s390/crypto/paes_s390.c | 1 + arch/s390/crypto/prng.c | 1 + arch/s390/crypto/sha.h | 1 + arch/s390/crypto/sha256_s390.c | 1 + arch/s390/crypto/sha512_s390.c | 1 + arch/s390/crypto/sha_common.c | 1 + 11 files changed, 11 insertions(+)
arch/s390/crypto/aes_s390.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Cryptographic API. *
arch/s390/crypto/arch_random.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * s390 arch random implementation. *
arch/s390/crypto/crc32-vx.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Crypto-API module for CRC-32 algorithms implemented with the * z/Architecture Vector Extension Facility.
arch/s390/crypto/des_s390.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Cryptographic API. *
arch/s390/crypto/ghash_s390.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Cryptographic API. *
arch/s390/crypto/paes_s390.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Cryptographic API. *
arch/s390/crypto/prng.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright IBM Corp. 2006, 2015 * Author(s): Jan Glauber <[email protected]>
arch/s390/crypto/sha.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Cryptographic API. *
arch/s390/crypto/sha256_s390.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Cryptographic API. *
arch/s390/crypto/sha512_s390.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Cryptographic API. *
arch/s390/crypto/sha_common.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Cryptographic API. *
Signature · 1 line
2.15.0
PATCH 4/12 s390: mm: add SPDX identifiers to the remaining files
In reply to Greg Kroah-HartmanIt's good to have SPDX identifiers in all files to make it easier to audit the kernel tree for correct licenses.
Update the arch/s390/mm/ files with the correct SPDX license identifier based on the license text in the file itself. The SPDX identifier is a legally binding shorthand, which can be used instead of the full boiler plate text.
This work is based on a script and data from Thomas Gleixner, Philippe Ombredanne, and Kate Stewart.
Cc Martin Schwidefsky <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc Christian Borntraeger <[email protected]>
Cc Cornelia Huck <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Kate Stewart <[email protected]>
Cc Philippe Ombredanne <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- arch/s390/mm/cmm.c | 1 + arch/s390/mm/gmap.c | 1 + arch/s390/mm/mmap.c | 1 + arch/s390/mm/pgtable.c | 1 + 4 files changed, 4 insertions(+)
arch/s390/mm/cmm.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Collaborative memory management interface. *
arch/s390/mm/gmap.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * KVM guest address space mapping code *
arch/s390/mm/mmap.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * flexible mmap layout support *
arch/s390/mm/pgtable.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright IBM Corp. 2007, 2011 * Author(s): Martin Schwidefsky <[email protected]>
Signature · 1 line
2.15.0
PATCH 5/12 s390: pci: add SPDX identifiers to the remaining files
In reply to Greg Kroah-HartmanIt's good to have SPDX identifiers in all files to make it easier to audit the kernel tree for correct licenses.
Update the arch/s390/pci/ files with the correct SPDX license identifier based on the license text in the file itself. The SPDX identifier is a legally binding shorthand, which can be used instead of the full boiler plate text.
This work is based on a script and data from Thomas Gleixner, Philippe Ombredanne, and Kate Stewart.
Cc Sebastian Ott <[email protected]>
Cc Gerald Schaefer <[email protected]>
Cc Martin Schwidefsky <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Kate Stewart <[email protected]>
Cc Philippe Ombredanne <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- arch/s390/pci/pci.c | 1 + arch/s390/pci/pci_debug.c | 1 + arch/s390/pci/pci_dma.c | 1 + arch/s390/pci/pci_insn.c | 1 + 4 files changed, 4 insertions(+)
arch/s390/pci/pci.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright IBM Corp. 2012 *
arch/s390/pci/pci_debug.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright IBM Corp. 2012,2015 *
arch/s390/pci/pci_dma.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright IBM Corp. 2012 *
arch/s390/pci/pci_insn.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * s390 specific pci instructions *
Signature · 1 line
2.15.0
PATCH 6/12 s390: appldata: add SPDX identifiers to the remaining files
In reply to Greg Kroah-HartmanIt's good to have SPDX identifiers in all files to make it easier to audit the kernel tree for correct licenses.
Update the arch/s390/appldata/ files with the correct SPDX license identifier based on the license text in the file itself. The SPDX identifier is a legally binding shorthand, which can be used instead of the full boiler plate text.
This work is based on a script and data from Thomas Gleixner, Philippe Ombredanne, and Kate Stewart.
Cc Martin Schwidefsky <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Kate Stewart <[email protected]>
Cc Philippe Ombredanne <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- arch/s390/appldata/appldata_base.c | 1 + arch/s390/appldata/appldata_mem.c | 1 + arch/s390/appldata/appldata_net_sum.c | 1 + arch/s390/appldata/appldata_os.c | 1 + 4 files changed, 4 insertions(+)
arch/s390/appldata/appldata_base.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Base infrastructure for Linux-z/VM Monitor Stream, Stage 1. * Exports appldata_register_ops() and appldata_unregister_ops() for the
arch/s390/appldata/appldata_mem.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Data gathering module for Linux-VM Monitor Stream, Stage 1. * Collects data related to memory management.
arch/s390/appldata/appldata_net_sum.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Data gathering module for Linux-VM Monitor Stream, Stage 1. * Collects accumulated network statistics (Packets received/transmitted,
arch/s390/appldata/appldata_os.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Data gathering module for Linux-VM Monitor Stream, Stage 1. * Collects misc. OS related data (CPU utilization, running processes).
Signature · 1 line
2.15.0
PATCH 7/12 s390: add SPDX identifiers to the remaining files
In reply to Greg Kroah-HartmanIt's good to have SPDX identifiers in all files to make it easier to audit the kernel tree for correct licenses.
Update the remaining arch/s390/ files with the correct SPDX license identifier based on the license text in the file itself. The SPDX identifier is a legally binding shorthand, which can be used instead of the full boiler plate text.
This work is based on a script and data from Thomas Gleixner, Philippe Ombredanne, and Kate Stewart.
Cc Martin Schwidefsky <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc Christian Borntraeger <[email protected]>
Cc Cornelia Huck <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Kate Stewart <[email protected]>
Cc Philippe Ombredanne <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- arch/s390/Makefile | 1 + arch/s390/boot/install.sh | 1 + arch/s390/hypfs/inode.c | 1 + arch/s390/include/asm/cpu_mf.h | 1 + arch/s390/include/asm/kprobes.h | 1 + arch/s390/include/asm/kvm_host.h | 1 + arch/s390/include/asm/kvm_para.h | 1 + arch/s390/include/asm/livepatch.h | 1 + arch/s390/include/asm/syscall.h | 1 + arch/s390/include/asm/sysinfo.h | 1 + 10 files changed, 10 insertions(+)
arch/s390/Makefile +1 -0
@@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # s390/Makefile #
arch/s390/boot/install.sh +1 -0
@@ -1,4 +1,5 @@ #!/bin/sh +# SPDX-License-Identifier: GPL-2.0 # # arch/s390x/boot/install.sh #
arch/s390/hypfs/inode.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-1.0+ /* * Hypervisor filesystem for Linux on s390. *
arch/s390/include/asm/cpu_mf.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * CPU-measurement facilities *
arch/s390/include/asm/kprobes.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_S390_KPROBES_H#define _ASM_S390_KPROBES_H/*
arch/s390/include/asm/kvm_host.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * definition for kernel virtual machines on s390 *
arch/s390/include/asm/kvm_para.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * definition for paravirtual devices on s390 *
arch/s390/include/asm/livepatch.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * livepatch.h - s390-specific Kernel Live Patching Core *
arch/s390/include/asm/syscall.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Access to user system call parameters and results *
arch/s390/include/asm/sysinfo.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * definition for store system information stsi *
Signature · 1 line
2.15.0
PATCH 8/12 s390: kvm: Remove redundant license text
In reply to Greg Kroah-HartmanNow that the SPDX tag is in all arch/s390/kvm/ files, that identifies the license in a specific and legally-defined manner. So the extra GPL text wording can be removed as it is no longer needed at all.
This is done on a quest to remove the 700+ different ways that files in the kernel describe the GPL license text. And there's unneeded stuff like the address (sometimes incorrect) for the FSF which is never needed.
No copyright headers or other non-license-description text was removed.
Cc Christian Borntraeger <[email protected]>
Cc Cornelia Huck <[email protected]>
Cc Martin Schwidefsky <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc "Paul E. McKenney" <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- arch/s390/kvm/Makefile | 4 ---- arch/s390/kvm/diag.c | 4 ---- arch/s390/kvm/gaccess.h | 4 ---- arch/s390/kvm/guestdbg.c | 4 ---- arch/s390/kvm/intercept.c | 4 ---- arch/s390/kvm/interrupt.c | 4 ---- arch/s390/kvm/irq.h | 4 ---- arch/s390/kvm/kvm-s390.c | 4 ---- arch/s390/kvm/kvm-s390.h | 4 ---- arch/s390/kvm/priv.c | 4 ---- arch/s390/kvm/sigp.c | 4 ---- arch/s390/kvm/vsie.c | 4 ---- 12 files changed, 48 deletions(-)
arch/s390/kvm/Makefile +0 -4
@@ -2,10 +2,6 @@ # Makefile for kernel virtual machines on s390 # # Copyright IBM Corp. 2008 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License (version 2 only) -# as published by the Free Software Foundation. KVM := ../../../virt/kvm common-objs = $(KVM)/kvm_main.o $(KVM)/eventfd.o $(KVM)/async_pf.o $(KVM)/irqchip.o $(KVM)/vfio.o
arch/s390/kvm/diag.c +0 -4
@@ -4,10 +4,6 @@* * Copyright IBM Corp. 2008, 2011 * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. -* * Author(s): Carsten Otte <[email protected]> * Christian Borntraeger <[email protected]> */
arch/s390/kvm/gaccess.h +0 -4
@@ -4,10 +4,6 @@* * Copyright IBM Corp. 2008, 2014 * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. -* * Author(s): Carsten Otte <[email protected]> */
arch/s390/kvm/guestdbg.c +0 -4
@@ -4,10 +4,6 @@* * Copyright IBM Corp. 2014 * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. -* * Author(s): David Hildenbrand <[email protected]> */ #include <linux/kvm_host.h>
arch/s390/kvm/intercept.c +0 -4
@@ -4,10 +4,6 @@* * Copyright IBM Corp. 2008, 2014 * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. -* * Author(s): Carsten Otte <[email protected]> * Christian Borntraeger <[email protected]> */
arch/s390/kvm/interrupt.c +0 -4
@@ -4,10 +4,6 @@* * Copyright IBM Corp. 2008, 2015 * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. -* * Author(s): Carsten Otte <[email protected]> */
arch/s390/kvm/irq.h +0 -4
@@ -4,10 +4,6 @@* * Copyright IBM Corp. 2014 * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. -* * Author(s): Cornelia Huck <[email protected]> */ #ifndef __KVM_IRQ_H
arch/s390/kvm/kvm-s390.c +0 -4
@@ -4,10 +4,6 @@* * Copyright IBM Corp. 2008, 2009 * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. -* * Author(s): Carsten Otte <[email protected]> * Christian Borntraeger <[email protected]> * Heiko Carstens <[email protected]>
arch/s390/kvm/kvm-s390.h +0 -4
@@ -4,10 +4,6 @@* * Copyright IBM Corp. 2008, 2009 * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. -* * Author(s): Carsten Otte <[email protected]> * Christian Borntraeger <[email protected]> * Christian Ehrhardt <[email protected]>
arch/s390/kvm/priv.c +0 -4
@@ -4,10 +4,6 @@* * Copyright IBM Corp. 2008, 2013 * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. -* * Author(s): Carsten Otte <[email protected]> * Christian Borntraeger <[email protected]> */
arch/s390/kvm/sigp.c +0 -4
@@ -4,10 +4,6 @@* * Copyright IBM Corp. 2008, 2013 * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. -* * Author(s): Carsten Otte <[email protected]> * Christian Borntraeger <[email protected]> * Christian Ehrhardt <[email protected]>
arch/s390/kvm/vsie.c +0 -4
@@ -4,10 +4,6 @@* * Copyright IBM Corp. 2016 * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. -* * Author(s): David Hildenbrand <[email protected]> */ #include <linux/vmalloc.h>
Signature · 1 line
2.15.0
Re: [PATCH 08/12] s390: kvm: Remove redundant license text
Quoted 17 lines · On Fri, 24 Nov 2017 15:00:39 +0100 Greg Kroah-Hartman…
Now that the SPDX tag is in all
arch/s390/kvm/files, that identifies the license in a specific and legally-defined manner. So the extra GPL text wording can be removed as it is no longer needed at all.This is done on a quest to remove the 700+ different ways that files in the kernel describe the GPL license text. And there's unneeded stuff like the address (sometimes incorrect) for the FSF which is never needed.
No copyright headers or other non-license-description text was removed.
Cc Christian Borntraeger <[email protected]>Cc Cornelia Huck <[email protected]>Cc Martin Schwidefsky <[email protected]>Cc Heiko Carstens <[email protected]>Cc "Paul E. McKenney" <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 14 lines
--- arch/s390/kvm/Makefile | 4 ---- arch/s390/kvm/diag.c | 4 ---- arch/s390/kvm/gaccess.h | 4 ---- arch/s390/kvm/guestdbg.c | 4 ---- arch/s390/kvm/intercept.c | 4 ---- arch/s390/kvm/interrupt.c | 4 ---- arch/s390/kvm/irq.h | 4 ---- arch/s390/kvm/kvm-s390.c | 4 ---- arch/s390/kvm/kvm-s390.h | 4 ---- arch/s390/kvm/priv.c | 4 ---- arch/s390/kvm/sigp.c | 4 ---- arch/s390/kvm/vsie.c | 4 ---- 12 files changed, 48 deletions(-)
Acked-by Cornelia Huck <[email protected]>
Re: [PATCH 08/12] s390: kvm: Remove redundant license text
In reply to Greg Kroah-HartmanQuoted 17 lines · Greg Kroah-Hartman
Now that the SPDX tag is in all
arch/s390/kvm/files, that identifies the license in a specific and legally-defined manner. So the extra GPL text wording can be removed as it is no longer needed at all.This is done on a quest to remove the 700+ different ways that files in the kernel describe the GPL license text. And there's unneeded stuff like the address (sometimes incorrect) for the FSF which is never needed.
No copyright headers or other non-license-description text was removed.
Cc Christian Borntraeger <[email protected]>Cc Cornelia Huck <[email protected]>Cc Martin Schwidefsky <[email protected]>Cc Heiko Carstens <[email protected]>Cc "Paul E. McKenney" <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 14 lines
--- arch/s390/kvm/Makefile | 4 ---- arch/s390/kvm/diag.c | 4 ---- arch/s390/kvm/gaccess.h | 4 ---- arch/s390/kvm/guestdbg.c | 4 ---- arch/s390/kvm/intercept.c | 4 ---- arch/s390/kvm/interrupt.c | 4 ---- arch/s390/kvm/irq.h | 4 ---- arch/s390/kvm/kvm-s390.c | 4 ---- arch/s390/kvm/kvm-s390.h | 4 ---- arch/s390/kvm/priv.c | 4 ---- arch/s390/kvm/sigp.c | 4 ---- arch/s390/kvm/vsie.c | 4 ---- 12 files changed, 48 deletions(-)
thanks, queued for kvms390
PATCH 9/12 s390: kernel: Remove redundant license text
In reply to Greg Kroah-HartmanNow that the SPDX tag is in all arch/s390/kernel/ files, that identifies the license in a specific and legally-defined manner. So the extra GPL text wording can be removed as it is no longer needed at all.
This is done on a quest to remove the 700+ different ways that files in the kernel describe the GPL license text. And there's unneeded stuff like the address (sometimes incorrect) for the FSF which is never needed.
No copyright headers or other non-license-description text was removed.
Cc Martin Schwidefsky <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
Cc Alexander Shishkin <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc "Paul E. McKenney" <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- arch/s390/kernel/kprobes.c | 14 -------------- arch/s390/kernel/module.c | 14 -------------- arch/s390/kernel/perf_cpum_cf.c | 4 ---- arch/s390/kernel/perf_cpum_sf.c | 4 ---- arch/s390/kernel/perf_event.c | 4 ---- arch/s390/kernel/sthyi.c | 4 ---- arch/s390/kernel/vdso.c | 4 ---- arch/s390/kernel/vdso32/clock_getres.S | 4 ---- arch/s390/kernel/vdso32/clock_gettime.S | 4 ---- arch/s390/kernel/vdso32/gettimeofday.S | 4 ---- arch/s390/kernel/vdso64/clock_getres.S | 4 ---- arch/s390/kernel/vdso64/clock_gettime.S | 4 ---- arch/s390/kernel/vdso64/gettimeofday.S | 4 ---- 13 files changed, 72 deletions(-)
arch/s390/kernel/kprobes.c +0 -14
@@ -2,20 +2,6 @@/* * Kernel Probes (KProbes) * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* * Copyright IBM Corp. 2002, 2006 * * s390 port, used ppc64 as template. Mike Grundy <[email protected]>
arch/s390/kernel/module.c +0 -14
@@ -9,20 +9,6 @@* * based on i386 version * Copyright (C) 2001 Rusty Russell. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <linux/module.h> #include <linux/elf.h>
arch/s390/kernel/perf_cpum_cf.c +0 -4
@@ -4,10 +4,6 @@* * Copyright IBM Corp. 2012, 2017 * Author(s): Hendrik Brueckner <[email protected]> -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. */ #define KMSG_COMPONENT "cpum_cf"#define pr_fmt (fmt) KMSG_COMPONENT ": " fmt
arch/s390/kernel/perf_cpum_sf.c +0 -4
@@ -4,10 +4,6 @@* * Copyright IBM Corp. 2013 * Author(s): Hendrik Brueckner <[email protected]> -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. */ #define KMSG_COMPONENT "cpum_sf"#define pr_fmt (fmt) KMSG_COMPONENT ": " fmt
arch/s390/kernel/perf_event.c +0 -4
@@ -4,10 +4,6 @@* * Copyright IBM Corp. 2012, 2013 * Author(s): Hendrik Brueckner <[email protected]> -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. */ #define KMSG_COMPONENT "perf"#define pr_fmt (fmt) KMSG_COMPONENT ": " fmt
arch/s390/kernel/sthyi.c +0 -4
@@ -1,10 +1,6 @@/* * store hypervisor information instruction emulation functions. * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. -* * Copyright IBM Corp. 2016 * Author(s): Janosch Frank <[email protected]> */
arch/s390/kernel/vdso.c +0 -4
@@ -4,10 +4,6 @@* * Copyright IBM Corp. 2008 * Author(s): Martin Schwidefsky ([email protected]) -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. */ #include <linux/init.h>
arch/s390/kernel/vdso32/clock_getres.S +0 -4
@@ -5,10 +5,6 @@ * * Copyright IBM Corp. 2008 * Author(s): Martin Schwidefsky ([email protected]) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License (version 2 only) - * as published by the Free Software Foundation. */ #include <asm/vdso.h> #include <asm/asm-offsets.h>
arch/s390/kernel/vdso32/clock_gettime.S +0 -4
@@ -5,10 +5,6 @@ * * Copyright IBM Corp. 2008 * Author(s): Martin Schwidefsky ([email protected]) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License (version 2 only) - * as published by the Free Software Foundation. */ #include <asm/vdso.h> #include <asm/asm-offsets.h>
arch/s390/kernel/vdso32/gettimeofday.S +0 -4
@@ -5,10 +5,6 @@ * * Copyright IBM Corp. 2008 * Author(s): Martin Schwidefsky ([email protected]) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License (version 2 only) - * as published by the Free Software Foundation. */ #include <asm/vdso.h> #include <asm/asm-offsets.h>
arch/s390/kernel/vdso64/clock_getres.S +0 -4
@@ -5,10 +5,6 @@ * * Copyright IBM Corp. 2008 * Author(s): Martin Schwidefsky ([email protected]) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License (version 2 only) - * as published by the Free Software Foundation. */ #include <asm/vdso.h> #include <asm/asm-offsets.h>
arch/s390/kernel/vdso64/clock_gettime.S +0 -4
@@ -5,10 +5,6 @@ * * Copyright IBM Corp. 2008 * Author(s): Martin Schwidefsky ([email protected]) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License (version 2 only) - * as published by the Free Software Foundation. */ #include <asm/vdso.h> #include <asm/asm-offsets.h>
arch/s390/kernel/vdso64/gettimeofday.S +0 -4
@@ -5,10 +5,6 @@ * * Copyright IBM Corp. 2008 * Author(s): Martin Schwidefsky ([email protected]) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License (version 2 only) - * as published by the Free Software Foundation. */ #include <asm/vdso.h> #include <asm/asm-offsets.h>
Signature · 1 line
2.15.0
PATCH 10/12 s390: include: Remove redundant license text
In reply to Greg Kroah-HartmanNow that the SPDX tag is in all arch/s390/include/ files, that identifies the license in a specific and legally-defined manner. So the extra GPL text wording can be removed as it is no longer needed at all.
This is done on a quest to remove the 700+ different ways that files in the kernel describe the GPL license text. And there's unneeded stuff like the address (sometimes incorrect) for the FSF which is never needed.
No copyright headers or other non-license-description text was removed.
Cc Martin Schwidefsky <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc Christian Borntraeger <[email protected]>
Cc Cornelia Huck <[email protected]>
Cc Halil Pasic <[email protected]>
Cc "Paul E. McKenney" <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- arch/s390/include/asm/cpu_mf.h | 4 ---- arch/s390/include/asm/kprobes.h | 14 -------------- arch/s390/include/asm/kvm_host.h | 4 ---- arch/s390/include/asm/kvm_para.h | 6 ------ arch/s390/include/asm/livepatch.h | 7 ------- arch/s390/include/asm/syscall.h | 4 ---- arch/s390/include/asm/sysinfo.h | 4 ---- arch/s390/include/uapi/asm/kvm.h | 4 ---- arch/s390/include/uapi/asm/kvm_para.h | 4 ---- arch/s390/include/uapi/asm/kvm_perf.h | 4 ---- arch/s390/include/uapi/asm/virtio-ccw.h | 4 ---- arch/s390/include/uapi/asm/zcrypt.h | 14 -------------- 12 files changed, 73 deletions(-)
arch/s390/include/asm/cpu_mf.h +0 -4
@@ -5,10 +5,6 @@* Copyright IBM Corp. 2012 * Author(s): Hendrik Brueckner <[email protected]> * Jan Glauber <[email protected]> -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. */ #ifndef _ASM_S390_CPU_MF_H#define _ASM_S390_CPU_MF_H
arch/s390/include/asm/kprobes.h +0 -14
@@ -4,20 +4,6 @@/* * Kernel Probes (KProbes) * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* * Copyright IBM Corp. 2002, 2006 * * 2002-Oct Created by Vamsi Krishna S <[email protected]> Kernel
arch/s390/include/asm/kvm_host.h +0 -4
@@ -4,10 +4,6 @@* * Copyright IBM Corp. 2008, 2009 * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. -* * Author(s): Carsten Otte <[email protected]> */
arch/s390/include/asm/kvm_para.h +0 -6
@@ -4,10 +4,6 @@* * Copyright IBM Corp. 2008 * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. -* * Author(s): Christian Borntraeger <[email protected]> */ /*
@@ -21,8 +17,6 @@* * Copyright IBM Corp. 2007,2008 * Author(s): Christian Borntraeger <[email protected]> -* -* This work is licensed under the terms of the GNU GPL, version 2. */ #ifndef __S390_KVM_PARA_H#define __S390_KVM_PARA_H
arch/s390/include/asm/livepatch.h +0 -7
@@ -8,13 +8,6 @@* Jiri Slaby */ -/* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the Free -* Software Foundation; either version 2 of the License, or (at your option) -* any later version. -*/ -#ifndef ASM_LIVEPATCH_H #define ASM_LIVEPATCH_H
arch/s390/include/asm/syscall.h +0 -4
@@ -4,10 +4,6 @@* * Copyright IBM Corp. 2008 * Author(s): Martin Schwidefsky ([email protected]) -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. */ #ifndef _ASM_SYSCALL_H
arch/s390/include/asm/sysinfo.h +0 -4
@@ -4,10 +4,6 @@* * Copyright IBM Corp. 2001, 2008 * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. -* * Author(s): Ulrich Weigand <[email protected]> * Christian Borntraeger <[email protected]> */
arch/s390/include/uapi/asm/kvm.h +0 -4
@@ -6,10 +6,6 @@* * Copyright IBM Corp. 2008 * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. -* * Author(s): Carsten Otte <[email protected]> * Christian Borntraeger <[email protected]> */
arch/s390/include/uapi/asm/kvm_para.h +0 -4
@@ -4,9 +4,5 @@* * Copyright IBM Corp. 2008 * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. -* * Author(s): Christian Borntraeger <[email protected]> */
arch/s390/include/uapi/asm/kvm_perf.h +0 -4
@@ -4,10 +4,6 @@* * Copyright 2014 IBM Corp. * Author(s): Alexander Yarygin <[email protected]> -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. */ #ifndef __LINUX_KVM_PERF_S390_H
arch/s390/include/uapi/asm/virtio-ccw.h +0 -4
@@ -4,10 +4,6 @@* * Copyright IBM Corp. 2013 * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. -* * Author(s): Cornelia Huck <[email protected]> */ #ifndef __KVM_VIRTIO_CCW_H
arch/s390/include/uapi/asm/zcrypt.h +0 -14
@@ -9,20 +9,6 @@* Eric Rossman ([email protected]) * * Hotplug & misc device support: Jochen Roehrig ([email protected]) -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2, or (at your option) -* any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef __ASM_S390_ZCRYPT_H
Signature · 1 line
2.15.0
PATCH 11/12 s390: crypto: Remove redundant license text
In reply to Greg Kroah-HartmanNow that the SPDX tag is in all arch/s390/crypto/ files, that identifies the license in a specific and legally-defined manner. So the extra GPL text wording can be removed as it is no longer needed at all.
This is done on a quest to remove the 700+ different ways that files in the kernel describe the GPL license text. And there's unneeded stuff like the address (sometimes incorrect) for the FSF which is never needed.
No copyright headers or other non-license-description text was removed.
Cc Herbert Xu <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Martin Schwidefsky <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc "Paul E. McKenney" <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- arch/s390/crypto/aes_s390.c | 6 ------ arch/s390/crypto/arch_random.c | 5 ----- arch/s390/crypto/des_s390.c | 6 ------ arch/s390/crypto/paes_s390.c | 5 ----- arch/s390/crypto/sha.h | 6 ------ arch/s390/crypto/sha256_s390.c | 6 ------ arch/s390/crypto/sha512_s390.c | 6 ------ arch/s390/crypto/sha_common.c | 6 ------ 8 files changed, 46 deletions(-)
arch/s390/crypto/aes_s390.c +0 -6
@@ -12,12 +12,6 @@* Harald Freudenberger <[email protected]> * * Derived from "crypto/aes_generic.c" -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the Free -* Software Foundation; either version 2 of the License, or (at your option) -* any later version. -* */ #define KMSG_COMPONENT "aes_s390"
arch/s390/crypto/arch_random.c +0 -5
@@ -4,11 +4,6 @@* * Copyright IBM Corp. 2017 * Author(s): Harald Freudenberger <[email protected]> -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. -* */ #include <linux/kernel.h>
arch/s390/crypto/des_s390.c +0 -6
@@ -7,12 +7,6 @@* Copyright IBM Corp. 2003, 2011 * Author(s): Thomas Spatzier * Jan Glauber ([email protected]) -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* */ #include <linux/init.h>
arch/s390/crypto/paes_s390.c +0 -5
@@ -8,11 +8,6 @@* Copyright IBM Corp. 2017 * Author(s): Martin Schwidefsky <[email protected]> * Harald Freudenberger <[email protected]> -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License (version 2 only) -* as published by the Free Software Foundation. -* */ #define KMSG_COMPONENT "paes_s390"
arch/s390/crypto/sha.h +0 -6
@@ -6,12 +6,6 @@* * Copyright IBM Corp. 2007 * Author(s): Jan Glauber ([email protected]) -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the Free -* Software Foundation; either version 2 of the License, or (at your option) -* any later version. -* */ #ifndef _CRYPTO_ARCH_S390_SHA_H#define _CRYPTO_ARCH_S390_SHA_H
arch/s390/crypto/sha256_s390.c +0 -6
@@ -7,12 +7,6 @@* s390 Version: * Copyright IBM Corp. 2005, 2011 * Author(s): Jan Glauber ([email protected]) -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the Free -* Software Foundation; either version 2 of the License, or (at your option) -* any later version. -* */ #include <crypto/internal/hash.h> #include <linux/init.h>
arch/s390/crypto/sha512_s390.c +0 -6
@@ -6,12 +6,6 @@* * Copyright IBM Corp. 2007 * Author(s): Jan Glauber ([email protected]) -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the Free -* Software Foundation; either version 2 of the License, or (at your option) -* any later version. -* */ #include <crypto/internal/hash.h> #include <crypto/sha.h>
arch/s390/crypto/sha_common.c +0 -6
@@ -6,12 +6,6 @@* * Copyright IBM Corp. 2007 * Author(s): Jan Glauber ([email protected]) -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the Free -* Software Foundation; either version 2 of the License, or (at your option) -* any later version. -* */ #include <crypto/internal/hash.h>
Signature · 1 line
2.15.0
PATCH 12/12 s390: Remove redundant license text
In reply to Greg Kroah-HartmanNow that the SPDX tag is in all arch/s390/ files, that identifies the license in a specific and legally-defined manner. So the extra GPL text wording in the remaining files can be removed as it is no longer needed at all.
This is done on a quest to remove the 700+ different ways that files in the kernel describe the GPL license text. And there's unneeded stuff like the address (sometimes incorrect) for the FSF which is never needed.
No copyright headers or other non-license-description text was removed.
Cc Martin Schwidefsky <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc "Paul E. McKenney" <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- arch/s390/Makefile | 4 ---- arch/s390/boot/install.sh | 4 ---- arch/s390/hypfs/inode.c | 1 - arch/s390/mm/mmap.c | 15 --------------- 4 files changed, 24 deletions(-)
arch/s390/Makefile +0 -4
@@ -7,10 +7,6 @@ # for "archclean" and "archdep" for cleaning up and making dependencies for # this architecture # -# This file is subject to the terms and conditions of the GNU General Public -# License. See the file "COPYING" in the main directory of this archive -# for more details. -# # Copyright (C) 1994 by Linus Torvalds #
arch/s390/boot/install.sh +0 -4
@@ -3,10 +3,6 @@ # # arch/s390x/boot/install.sh # -# This file is subject to the terms and conditions of the GNU General Public -# License. See the file "COPYING" in the main directory of this archive -# for more details. -# # Copyright (C) 1995 by Linus Torvalds # # Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin
arch/s390/hypfs/inode.c +0 -1
@@ -4,7 +4,6 @@* * Copyright IBM Corp. 2006, 2008 * Author(s): Michael Holzheu <[email protected]> -* License: GPL */ #define KMSG_COMPONENT "hypfs"
arch/s390/mm/mmap.c +0 -15
@@ -5,21 +5,6 @@* Copyright 2003-2004 Red Hat Inc., Durham, North Carolina. * All Rights Reserved. * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -* -* * Started by Ingo Molnar <[email protected]> */
Signature · 1 line
2.15.0
Quoted 7 lines · On Fri, 24 Nov 2017 15:00:31 +0100 Greg Kroah-Hartman…
Here are 12 patches against linux-next of today that add SPDX identifiers to the remaining files in
arch/s390that do not currently have them, and then it cleans up the various different ways that the license text boilerplate was written for the GPLv2 in a few files. This cleanup was done in the quest to remove the 700+ different ways the kernel describes GPLv2.
Quoted 5 lines
No copyright headers or any other non-license-description text was removed in these patches.
FWIW, this license cleanup action has been "blessed" by IBM lawyers, but feel free to check internally if you are curious.
Ok, Christian picked up patches #2 and #8. I have added the remaining 10 patches to the fixes branch of s390/linux and created an additional patch to have arch/s390/kernel/sthyi.c marked as GPL-2.0.
Thanks Greg!
Signature · 4 lines
blue skies, Martin. "Reality continues to ruin my life." - Calvin.
Quoted 13 lines · Martin Schwidefsky
Quoted 10 lines · On Fri, 24 Nov 2017 15:00:31 +0100 Greg Kroah-Hartman…
Here are 12 patches against linux-next of today that add SPDX identifiers to the remaining files in
arch/s390that do not currently have them, and then it cleans up the various different ways that the license text boilerplate was written for the GPLv2 in a few files. This cleanup was done in the quest to remove the 700+ different ways the kernel describes GPLv2.No copyright headers or any other non-license-description text was removed in these patches.
Quoted 6 lines
Quoted 2 lines
FWIW, this license cleanup action has been "blessed" by IBM lawyers, but feel free to check internally if you are curious.
Ok, Christian picked up patches #2 and #8. I have added the remaining 10 patches to the fixes branch of s390/linux and created an additional patch to have
arch/s390/kernel/sthyi.cmarked as GPL-2.0.
Wonderful, thanks for picking them all up and doing that additional file, missed that one, sorry.
greg k-h