drivers/s390/ license text cleanup
Subsystems (11)
cover drivers/s390/ license text cleanup
Hi all,
Here are 9 patches against linux-next of today that add SPDX identifiers to the remaining files 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 (9):
s390: block: add SPDX identifiers to the remaining files
s390: crypto: add SPDX identifiers to the remaining files
s390: cio: add SPDX identifiers to the remaining files
s390: char: add SPDX identifiers to the remaining files
s390: net: add SPDX identifiers to the remaining files
s390: scsi: zfcp_aux: add SPDX identifier
s390: virtio: add SPDX identifiers to the remaining files
s390: crypto: Remove redundant license text
s390: drivers: Remove redundant license text
drivers/s390/block/dasd.c | 1 + drivers/s390/block/dasd_devmap.c | 1 + drivers/s390/block/dasd_diag.c | 1 + drivers/s390/block/dasd_eckd.c | 1 + drivers/s390/block/dasd_fba.c | 1 + drivers/s390/block/dcssblk.c | 1 + drivers/s390/block/scm_blk.c | 1 + drivers/s390/block/xpram.c | 1 + drivers/s390/char/fs3270.c | 1 + drivers/s390/char/hmcdrv_mod.c | 1 + drivers/s390/char/monreader.c | 1 + drivers/s390/char/monwriter.c | 1 + drivers/s390/char/raw3270.c | 1 + drivers/s390/char/sclp_async.c | 1 + drivers/s390/char/tape_34xx.c | 1 + drivers/s390/char/tape_3590.c | 1 + drivers/s390/char/tape_class.c | 1 + drivers/s390/char/tape_core.c | 1 + drivers/s390/char/tty3270.c | 1 + drivers/s390/char/vmlogrdr.c | 1 + drivers/s390/char/vmur.c | 1 + drivers/s390/char/zcore.c | 2 +- drivers/s390/cio/ccwgroup.c | 1 + drivers/s390/cio/chp.c | 1 + drivers/s390/cio/chsc.c | 1 + drivers/s390/cio/chsc_sch.c | 1 + drivers/s390/cio/cio.c | 1 + drivers/s390/cio/cmf.c | 15 +-------------- drivers/s390/cio/css.c | 3 +-- drivers/s390/cio/device.c | 3 +-- drivers/s390/cio/device_fsm.c | 1 + drivers/s390/cio/device_ops.c | 3 +-- drivers/s390/cio/eadm_sch.c | 1 + drivers/s390/cio/isc.c | 1 + drivers/s390/cio/qdio_main.c | 1 + drivers/s390/cio/qdio_setup.c | 1 + drivers/s390/cio/scm.c | 1 + drivers/s390/cio/vfio_ccw_drv.c | 1 + drivers/s390/crypto/ap_bus.c | 15 +-------------- drivers/s390/crypto/ap_bus.h | 15 +-------------- drivers/s390/crypto/pkey_api.c | 6 +----- drivers/s390/crypto/zcrypt_api.c | 15 +-------------- drivers/s390/crypto/zcrypt_api.h | 15 +-------------- drivers/s390/crypto/zcrypt_card.c | 11 +---------- drivers/s390/crypto/zcrypt_cca_key.h | 15 +-------------- drivers/s390/crypto/zcrypt_cex2a.c | 15 +-------------- drivers/s390/crypto/zcrypt_cex2a.h | 15 +-------------- drivers/s390/crypto/zcrypt_cex4.c | 1 + drivers/s390/crypto/zcrypt_error.h | 15 +-------------- drivers/s390/crypto/zcrypt_msgtype50.c | 15 +-------------- drivers/s390/crypto/zcrypt_msgtype50.h | 15 +-------------- drivers/s390/crypto/zcrypt_msgtype6.c | 15 +-------------- drivers/s390/crypto/zcrypt_msgtype6.h | 15 +-------------- drivers/s390/crypto/zcrypt_pcixcc.c | 15 +-------------- drivers/s390/crypto/zcrypt_pcixcc.h | 15 +-------------- drivers/s390/crypto/zcrypt_queue.c | 11 +---------- drivers/s390/net/ctcm_main.c | 1 + drivers/s390/net/fsm.c | 1 + drivers/s390/net/lcs.c | 15 +-------------- drivers/s390/net/netiucv.c | 16 +--------------- drivers/s390/net/qeth_core_main.c | 1 + drivers/s390/net/qeth_core_sys.c | 1 + drivers/s390/net/qeth_l2_main.c | 1 + drivers/s390/net/qeth_l3_main.c | 1 + drivers/s390/net/smsgiucv.c | 15 +-------------- drivers/s390/net/smsgiucv_app.c | 1 + drivers/s390/scsi/zfcp_aux.c | 1 + drivers/s390/virtio/Makefile | 5 +---- drivers/s390/virtio/virtio_ccw.c | 5 +---- 69 files changed, 69 insertions(+), 293 deletions(-)
Signature · 1 line
2.15.0
PATCH 1/9 s390: block: 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 drivers/s390/block/ 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.
--- drivers/s390/block/dasd.c | 1 + drivers/s390/block/dasd_devmap.c | 1 + drivers/s390/block/dasd_diag.c | 1 + drivers/s390/block/dasd_eckd.c | 1 + drivers/s390/block/dasd_fba.c | 1 + drivers/s390/block/dcssblk.c | 1 + drivers/s390/block/scm_blk.c | 1 + drivers/s390/block/xpram.c | 1 + 8 files changed, 8 insertions(+)
drivers/s390/block/dasd.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Author(s)......: Holger Smolinski <[email protected]> * Horst Hummel <[email protected]>
drivers/s390/block/dasd_devmap.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Author(s)......: Holger Smolinski <[email protected]> * Horst Hummel <[email protected]>
drivers/s390/block/dasd_diag.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Author(s)......: Holger Smolinski <[email protected]> * Based on.......: linux/drivers/s390/block/mdisk.c
drivers/s390/block/dasd_eckd.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Author(s)......: Holger Smolinski <[email protected]> * Horst Hummel <[email protected]>
drivers/s390/block/dasd_fba.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Author(s)......: Holger Smolinski <[email protected]> * Bugreports.to..: <[email protected]>
drivers/s390/block/dcssblk.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * dcssblk.c -- the S/390 block driver for dcss memory *
drivers/s390/block/scm_blk.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Block driver for s390 storage class memory. *
drivers/s390/block/xpram.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Xpram.c -- the S/390 expanded memory RAM-disk *
Signature · 1 line
2.15.0
PATCH 2/9 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 drivers/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.
--- drivers/s390/crypto/ap_bus.c | 1 + drivers/s390/crypto/ap_bus.h | 1 + drivers/s390/crypto/pkey_api.c | 1 + drivers/s390/crypto/zcrypt_api.c | 1 + drivers/s390/crypto/zcrypt_api.h | 1 + drivers/s390/crypto/zcrypt_card.c | 1 + drivers/s390/crypto/zcrypt_cca_key.h | 1 + drivers/s390/crypto/zcrypt_cex2a.c | 1 + drivers/s390/crypto/zcrypt_cex2a.h | 1 + drivers/s390/crypto/zcrypt_cex4.c | 1 + drivers/s390/crypto/zcrypt_error.h | 1 + drivers/s390/crypto/zcrypt_msgtype50.c | 1 + drivers/s390/crypto/zcrypt_msgtype50.h | 1 + drivers/s390/crypto/zcrypt_msgtype6.c | 1 + drivers/s390/crypto/zcrypt_msgtype6.h | 1 + drivers/s390/crypto/zcrypt_pcixcc.c | 1 + drivers/s390/crypto/zcrypt_pcixcc.h | 1 + drivers/s390/crypto/zcrypt_queue.c | 1 + 18 files changed, 18 insertions(+)
drivers/s390/crypto/ap_bus.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright IBM Corp. 2006, 2012 * Author(s): Cornelia Huck <[email protected]>
drivers/s390/crypto/ap_bus.h +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright IBM Corp. 2006, 2012 * Author(s): Cornelia Huck <[email protected]>
drivers/s390/crypto/pkey_api.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * pkey device driver *
drivers/s390/crypto/zcrypt_api.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * zcrypt 2.1.0 *
drivers/s390/crypto/zcrypt_api.h +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * zcrypt 2.1.0 *
drivers/s390/crypto/zcrypt_card.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * zcrypt 2.1.0 *
drivers/s390/crypto/zcrypt_cca_key.h +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * zcrypt 2.1.0 *
drivers/s390/crypto/zcrypt_cex2a.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * zcrypt 2.1.0 *
drivers/s390/crypto/zcrypt_cex2a.h +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * zcrypt 2.1.0 *
drivers/s390/crypto/zcrypt_cex4.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright IBM Corp. 2012 * Author(s): Holger Dengler <[email protected]>
drivers/s390/crypto/zcrypt_error.h +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * zcrypt 2.1.0 *
drivers/s390/crypto/zcrypt_msgtype50.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * zcrypt 2.1.0 *
drivers/s390/crypto/zcrypt_msgtype50.h +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * zcrypt 2.1.0 *
drivers/s390/crypto/zcrypt_msgtype6.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * zcrypt 2.1.0 *
drivers/s390/crypto/zcrypt_msgtype6.h +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * zcrypt 2.1.0 *
drivers/s390/crypto/zcrypt_pcixcc.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * zcrypt 2.1.0 *
drivers/s390/crypto/zcrypt_pcixcc.h +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * zcrypt 2.1.0 *
drivers/s390/crypto/zcrypt_queue.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * zcrypt 2.1.0 *
Signature · 1 line
2.15.0
PATCH 3/9 s390: cio: 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 drivers/s390/cio/ 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.
--- drivers/s390/cio/ccwgroup.c | 1 + drivers/s390/cio/chp.c | 1 + drivers/s390/cio/chsc.c | 1 + drivers/s390/cio/chsc_sch.c | 1 + drivers/s390/cio/cio.c | 1 + drivers/s390/cio/cmf.c | 1 + drivers/s390/cio/css.c | 1 + drivers/s390/cio/device.c | 1 + drivers/s390/cio/device_fsm.c | 1 + drivers/s390/cio/device_ops.c | 1 + drivers/s390/cio/eadm_sch.c | 1 + drivers/s390/cio/isc.c | 1 + drivers/s390/cio/qdio_main.c | 1 + drivers/s390/cio/qdio_setup.c | 1 + drivers/s390/cio/scm.c | 1 + drivers/s390/cio/vfio_ccw_drv.c | 1 + 16 files changed, 16 insertions(+)
drivers/s390/cio/ccwgroup.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * bus driver for ccwgroup *
drivers/s390/cio/chp.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright IBM Corp. 1999, 2010 * Author(s): Cornelia Huck ([email protected])
drivers/s390/cio/chsc.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * S/390 common I/O routines -- channel subsystem call *
drivers/s390/cio/chsc_sch.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Driver for s390 chsc subchannels *
drivers/s390/cio/cio.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * S/390 common I/O routines -- low level i/o calls *
drivers/s390/cio/cmf.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Linux on zSeries Channel Measurement Facility support *
drivers/s390/cio/css.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * driver for channel subsystem *
drivers/s390/cio/device.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-1.0+ /* * bus driver for ccw devices *
drivers/s390/cio/device_fsm.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * finite state machine for device handling *
drivers/s390/cio/device_ops.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-1.0+ /* * Copyright IBM Corp. 2002, 2009 *
drivers/s390/cio/eadm_sch.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Driver for s390 eadm subchannels *
drivers/s390/cio/isc.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Functions for registration of I/O interruption subclasses on s390. *
drivers/s390/cio/qdio_main.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Linux for s390 qdio support, buffer handling, qdio API and module support. *
drivers/s390/cio/qdio_setup.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * qdio queue initialization *
drivers/s390/cio/scm.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Recognize and maintain s390 storage class memory. *
drivers/s390/cio/vfio_ccw_drv.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * VFIO based Physical Subchannel device driver *
Signature · 1 line
2.15.0
Re: [PATCH 3/9] s390: cio: add SPDX identifiers to the remaining files
Quoted 31 lines · On Tue, 14 Nov 2017 18:38:02 +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
drivers/s390/cio/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 Peter Oberparleiter <[email protected]>Cc Martin Schwidefsky <[email protected]>Cc Heiko Carstens <[email protected]>Cc Cornelia Huck <[email protected]>Cc Dong Jia Shi <[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]>--- drivers/s390/cio/ccwgroup.c | 1 + drivers/s390/cio/chp.c | 1 + drivers/s390/cio/chsc.c | 1 + drivers/s390/cio/chsc_sch.c | 1 + drivers/s390/cio/cio.c | 1 + drivers/s390/cio/cmf.c | 1 + drivers/s390/cio/css.c | 1 + drivers/s390/cio/device.c | 1 + drivers/s390/cio/device_fsm.c | 1 +
Quoted 8 lines
drivers/s390/cio/device_ops.c | 1 + drivers/s390/cio/eadm_sch.c | 1 + drivers/s390/cio/isc.c | 1 + drivers/s390/cio/qdio_main.c | 1 + drivers/s390/cio/qdio_setup.c | 1 + drivers/s390/cio/scm.c | 1 + drivers/s390/cio/vfio_ccw_drv.c | 1 + 16 files changed, 16 insertions(+)
PATCH 4/9 s390: char: 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 drivers/s390/char/ 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.
--- drivers/s390/char/fs3270.c | 1 + drivers/s390/char/hmcdrv_mod.c | 1 + drivers/s390/char/monreader.c | 1 + drivers/s390/char/monwriter.c | 1 + drivers/s390/char/raw3270.c | 1 + drivers/s390/char/sclp_async.c | 1 + drivers/s390/char/tape_34xx.c | 1 + drivers/s390/char/tape_3590.c | 1 + drivers/s390/char/tape_class.c | 1 + drivers/s390/char/tape_core.c | 1 + drivers/s390/char/tty3270.c | 1 + drivers/s390/char/vmlogrdr.c | 1 + drivers/s390/char/vmur.c | 1 + drivers/s390/char/zcore.c | 1 + 14 files changed, 14 insertions(+)
drivers/s390/char/fs3270.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * IBM/3270 Driver - fullscreen driver. *
drivers/s390/char/hmcdrv_mod.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * HMC Drive DVD Module *
drivers/s390/char/monreader.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Character device driver for reading z/VM *MONITOR service records. *
drivers/s390/char/monwriter.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Character device driver for writing z/VM *MONITOR service records. *
drivers/s390/char/raw3270.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * IBM/3270 Driver - core functions. *
drivers/s390/char/sclp_async.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Enable Asynchronous Notification via SCLP. *
drivers/s390/char/tape_34xx.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * tape device discipline for 3480/3490 tapes. *
drivers/s390/char/tape_3590.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * tape device discipline for 3590 tapes. *
drivers/s390/char/tape_class.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright IBM Corp. 2004 *
drivers/s390/char/tape_core.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * basic function of the tape device driver *
drivers/s390/char/tty3270.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * IBM/3270 Driver - tty functions. *
drivers/s390/char/vmlogrdr.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * character device driver for reading z/VM system service records *
drivers/s390/char/vmur.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Linux driver for System z and s390 unit record devices * (z/VM virtual punch, reader, printer)
drivers/s390/char/zcore.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-1.0+ /* * zcore module to export memory content and register sets for creating system * dumps on SCSI disks (zfcpdump). The "zcore/mem" debugfs file shows the same
Signature · 1 line
2.15.0
PATCH 5/9 s390: net: 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 drivers/s390/net/ 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.
--- drivers/s390/net/ctcm_main.c | 1 + drivers/s390/net/fsm.c | 1 + drivers/s390/net/lcs.c | 1 + drivers/s390/net/netiucv.c | 1 + drivers/s390/net/qeth_core_main.c | 1 + drivers/s390/net/qeth_core_sys.c | 1 + drivers/s390/net/qeth_l2_main.c | 1 + drivers/s390/net/qeth_l3_main.c | 1 + drivers/s390/net/smsgiucv.c | 1 + drivers/s390/net/smsgiucv_app.c | 1 + 10 files changed, 10 insertions(+)
drivers/s390/net/ctcm_main.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright IBM Corp. 2001, 2009 * Author(s):
drivers/s390/net/fsm.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /** * A generic FSM based on fsm used in isdn4linux *
drivers/s390/net/lcs.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Linux for S/390 Lan Channel Station Network Driver *
drivers/s390/net/netiucv.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * IUCV network driver *
drivers/s390/net/qeth_core_main.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright IBM Corp. 2007, 2009 * Author(s): Utz Bacher <[email protected]>,
drivers/s390/net/qeth_core_sys.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright IBM Corp. 2007 * Author(s): Utz Bacher <[email protected]>,
drivers/s390/net/qeth_l2_main.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright IBM Corp. 2007, 2009 * Author(s): Utz Bacher <[email protected]>,
drivers/s390/net/qeth_l3_main.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright IBM Corp. 2007, 2009 * Author(s): Utz Bacher <[email protected]>,
drivers/s390/net/smsgiucv.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * IUCV special message driver *
drivers/s390/net/smsgiucv_app.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Deliver z/VM CP special messages (SMSG) as uevents. *
Signature · 1 line
2.15.0
Re: [PATCH 5/9] s390: net: add SPDX identifiers to the remaining files
Quoted 29 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
drivers/s390/net/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 Julian Wiedmann <[email protected]>Cc Ursula Braun <[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]>---
drivers/s390/net/fsm.c +1
-0@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /** * A generic FSM based on fsm used in isdn4linux
Quoted 1 line
*
What's the rationale to add GPL-2.0 to this file? This seems to be a bit confusing since this file has no explicit license template, except this one:
MODULE_LICENSE("GPL");
Which, according to include/linux/module.h translates to
"GPL" [GNU Public License v2 or later]
On the other hand there are files like drivers/s390/char/zcore.c which just contain a statement "License: GPL", which was converted to GPL-1.0+ (see patch 4 of this series).
Right now I'm not saying that anything is wrong here, but I'd like to understand the rationale.
Re: [PATCH 5/9] s390: net: add SPDX identifiers to the remaining files
Quoted 38 lines · Heiko Carstens
Quoted 29 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
drivers/s390/net/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 Julian Wiedmann <[email protected]>Cc Ursula Braun <[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]>---
drivers/s390/net/fsm.c +1
-0@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /** * A generic FSM based on fsm used in isdn4linux Quoted 1 line
*
What's the rationale to add GPL-2.0 to this file? This seems to be a bit confusing since this file has no explicit license template, except this one:
MODULE_LICENSE("GPL");
Quoted 8 lines
Which, according to
include/linux/module.htranslates to
"GPL" [GNU Public License v2 or later]On the other hand there are files like
drivers/s390/char/zcore.cwhich just contain a statement "License: GPL", which was converted to GPL-1.0+ (see patch 4 of this series).
Right now I'm not saying that anything is wrong here, but I'd like to understand the rationale.
For any files with no explicit license in them, like this one, the "implicit" license of GPL-2.0 is assumed. See commit b24413180f56 ("License cleanup: add SPDX GPL-2.0 license identifier to files with no license") in Linus's tree for a full description of this, where we converted all in-tree files at the time that did not have a explicit license in it. It seems this file missed that initial commit, sorry, I don't know how that happened, especially as this file has been in the tree for a very very long time.
Philippe, any ideas how we missed this file in the previous large sweep?
thanks,
greg k-h
PATCH 6/9 s390: scsi: zfcp_aux: add SPDX identifier
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 drivers/s390/scsi/zfcp_aux.c file 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.
--- drivers/s390/scsi/zfcp_aux.c | 1 + 1 file changed, 1 insertion(+)
drivers/s390/scsi/zfcp_aux.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * zfcp device driver *
Signature · 1 line
2.15.0
PATCH 7/9 s390: virtio: 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 drivers/s390/virtio/ 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.
--- drivers/s390/virtio/Makefile | 1 + drivers/s390/virtio/virtio_ccw.c | 1 + 2 files changed, 2 insertions(+)
drivers/s390/virtio/Makefile +1 -0
@@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # Makefile for kvm guest drivers on s390 # # Copyright IBM Corp. 2008
drivers/s390/virtio/virtio_ccw.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * ccw based virtio transport *
Signature · 1 line
2.15.0
Re: [PATCH 7/9] s390: virtio: add SPDX identifiers to the remaining files
Quoted 19 lines · On Tue, 14 Nov 2017 18:38:06 +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
drivers/s390/virtio/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 Cornelia Huck <[email protected]>Cc Halil Pasic <[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 4 lines
--- drivers/s390/virtio/Makefile | 1 + drivers/s390/virtio/virtio_ccw.c | 1 + 2 files changed, 2 insertions(+)
PATCH 8/9 s390: crypto: Remove redundant license text
In reply to Greg Kroah-HartmanNow that the SPDX tag is in all drivers/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.
--- drivers/s390/crypto/ap_bus.c | 14 -------------- drivers/s390/crypto/ap_bus.h | 14 -------------- drivers/s390/crypto/pkey_api.c | 5 ----- drivers/s390/crypto/zcrypt_api.c | 14 -------------- drivers/s390/crypto/zcrypt_api.h | 14 -------------- drivers/s390/crypto/zcrypt_card.c | 10 ---------- drivers/s390/crypto/zcrypt_cca_key.h | 14 -------------- drivers/s390/crypto/zcrypt_cex2a.c | 14 -------------- drivers/s390/crypto/zcrypt_cex2a.h | 14 -------------- drivers/s390/crypto/zcrypt_error.h | 14 -------------- drivers/s390/crypto/zcrypt_msgtype50.c | 14 -------------- drivers/s390/crypto/zcrypt_msgtype50.h | 14 -------------- drivers/s390/crypto/zcrypt_msgtype6.c | 14 -------------- drivers/s390/crypto/zcrypt_msgtype6.h | 14 -------------- drivers/s390/crypto/zcrypt_pcixcc.c | 14 -------------- drivers/s390/crypto/zcrypt_pcixcc.h | 14 -------------- drivers/s390/crypto/zcrypt_queue.c | 10 ---------- 17 files changed, 221 deletions(-)
drivers/s390/crypto/ap_bus.c +0 -14
@@ -8,20 +8,6 @@* Holger Dengler <[email protected]> * * Adjunct processor bus. -* -* 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. */ #define KMSG_COMPONENT "ap"
drivers/s390/crypto/ap_bus.h +0 -14
@@ -8,20 +8,6 @@* Holger Dengler <[email protected]> * * Adjunct processor bus header file. -* -* 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 _AP_BUS_H_
drivers/s390/crypto/pkey_api.c +0 -5
@@ -4,11 +4,6 @@* * Copyright IBM Corp. 2017 * Author(s): Harald Freudenberger -* -* 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 "pkey"
drivers/s390/crypto/zcrypt_api.c +0 -14
@@ -11,20 +11,6 @@* Major cleanup & driver split: Martin Schwidefsky <[email protected]> * Ralph Wuerthner <[email protected]> * MSGTYPE restruct: Holger Dengler <[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. */ #include <linux/module.h>
drivers/s390/crypto/zcrypt_api.h +0 -14
@@ -11,20 +11,6 @@* Major cleanup & driver split: Martin Schwidefsky <[email protected]> * Ralph Wuerthner <[email protected]> * MSGTYPE restruct: Holger Dengler <[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 _ZCRYPT_API_H_
drivers/s390/crypto/zcrypt_card.c +0 -10
@@ -11,16 +11,6 @@* Major cleanup & driver split: Martin Schwidefsky <[email protected]> * Ralph Wuerthner <[email protected]> * MSGTYPE restruct: Holger Dengler <[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. */ #include <linux/module.h>
drivers/s390/crypto/zcrypt_cca_key.h +0 -14
@@ -8,20 +8,6 @@* * Hotplug & misc device support: Jochen Roehrig ([email protected]) * Major cleanup & driver split: 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 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 _ZCRYPT_CCA_KEY_H_
drivers/s390/crypto/zcrypt_cex2a.c +0 -14
@@ -10,20 +10,6 @@* Major cleanup & driver split: Martin Schwidefsky <[email protected]> * Ralph Wuerthner <[email protected]> * MSGTYPE restruct: Holger Dengler <[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. */ #include <linux/module.h>
drivers/s390/crypto/zcrypt_cex2a.h +0 -14
@@ -8,20 +8,6 @@* * Hotplug & misc device support: Jochen Roehrig ([email protected]) * Major cleanup & driver split: 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 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 _ZCRYPT_CEX2A_H_
drivers/s390/crypto/zcrypt_error.h +0 -14
@@ -8,20 +8,6 @@* * Hotplug & misc device support: Jochen Roehrig ([email protected]) * Major cleanup & driver split: 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 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 _ZCRYPT_ERROR_H_
drivers/s390/crypto/zcrypt_msgtype50.c +0 -14
@@ -10,20 +10,6 @@* Major cleanup & driver split: Martin Schwidefsky <[email protected]> * Ralph Wuerthner <[email protected]> * MSGTYPE restruct: Holger Dengler <[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. */ #define KMSG_COMPONENT "zcrypt"
drivers/s390/crypto/zcrypt_msgtype50.h +0 -14
@@ -9,20 +9,6 @@* Hotplug & misc device support: Jochen Roehrig ([email protected]) * Major cleanup & driver split: Martin Schwidefsky <[email protected]> * MSGTYPE restruct: Holger Dengler <[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 _ZCRYPT_MSGTYPE50_H_
drivers/s390/crypto/zcrypt_msgtype6.c +0 -14
@@ -10,20 +10,6 @@* Major cleanup & driver split: Martin Schwidefsky <[email protected]> * Ralph Wuerthner <[email protected]> * MSGTYPE restruct: Holger Dengler <[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. */ #define KMSG_COMPONENT "zcrypt"
drivers/s390/crypto/zcrypt_msgtype6.h +0 -14
@@ -9,20 +9,6 @@* Hotplug & misc device support: Jochen Roehrig ([email protected]) * Major cleanup & driver split: Martin Schwidefsky <[email protected]> * MSGTYPE restruct: Holger Dengler <[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 _ZCRYPT_MSGTYPE6_H_
drivers/s390/crypto/zcrypt_pcixcc.c +0 -14
@@ -10,20 +10,6 @@* Major cleanup & driver split: Martin Schwidefsky <[email protected]> * Ralph Wuerthner <[email protected]> * MSGTYPE restruct: Holger Dengler <[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. */ #include <linux/module.h>
drivers/s390/crypto/zcrypt_pcixcc.h +0 -14
@@ -9,20 +9,6 @@* Hotplug & misc device support: Jochen Roehrig ([email protected]) * Major cleanup & driver split: Martin Schwidefsky <[email protected]> * MSGTYPE restruct: Holger Dengler <[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 _ZCRYPT_PCIXCC_H_
drivers/s390/crypto/zcrypt_queue.c +0 -10
@@ -11,16 +11,6 @@* Major cleanup & driver split: Martin Schwidefsky <[email protected]> * Ralph Wuerthner <[email protected]> * MSGTYPE restruct: Holger Dengler <[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. */ #include <linux/module.h>
Signature · 1 line
2.15.0
PATCH 9/9 s390: drivers: Remove redundant license text
In reply to Greg Kroah-HartmanNow that the SPDX tag is in all drivers/s390/ 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.
--- drivers/s390/char/zcore.c | 1 - drivers/s390/cio/cmf.c | 14 -------------- drivers/s390/cio/css.c | 2 -- drivers/s390/cio/device.c | 2 -- drivers/s390/cio/device_ops.c | 2 -- drivers/s390/net/lcs.c | 14 -------------- drivers/s390/net/netiucv.c | 15 --------------- drivers/s390/net/smsgiucv.c | 14 -------------- drivers/s390/virtio/Makefile | 4 ---- drivers/s390/virtio/virtio_ccw.c | 4 ---- 10 files changed, 72 deletions(-)
drivers/s390/char/zcore.c +0 -1
@@ -8,7 +8,6 @@* * Copyright IBM Corp. 2003, 2008 * Author(s): Michael Holzheu -* License: GPL */ #define KMSG_COMPONENT "zdump"
drivers/s390/cio/cmf.c +0 -14
@@ -8,20 +8,6 @@* Cornelia Huck <[email protected]> * * original idea from Natarajan Krishnaswami <[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. */ #define KMSG_COMPONENT "cio"
drivers/s390/cio/css.c +0 -2
@@ -6,8 +6,6 @@* * Author(s): Arnd Bergmann ([email protected]) * Cornelia Huck ([email protected]) -* -* License: GPL */ #define KMSG_COMPONENT "cio"
drivers/s390/cio/device.c +0 -2
@@ -6,8 +6,6 @@* Author(s): Arnd Bergmann ([email protected]) * Cornelia Huck ([email protected]) * Martin Schwidefsky ([email protected]) -* -* License: GPL */ #define KMSG_COMPONENT "cio"
drivers/s390/cio/device_ops.c +0 -2
@@ -4,8 +4,6 @@* * Author(s): Martin Schwidefsky ([email protected]) * Cornelia Huck ([email protected]) -* -* License: GPL */ #include <linux/export.h> #include <linux/init.h>
drivers/s390/net/lcs.c +0 -14
@@ -8,20 +8,6 @@* Rewritten by * Frank Pavlic <[email protected]> and * 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 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. */ #define KMSG_COMPONENT "lcs"
drivers/s390/net/netiucv.c +0 -15
@@ -19,21 +19,6 @@* Denis Joseph Barrow ([email protected],[email protected]) * Martin Schwidefsky ([email protected]) * Alan Altmark ([email protected]) Sept. 2000 -* -* 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. -* */ #define KMSG_COMPONENT "netiucv"
drivers/s390/net/smsgiucv.c +0 -14
@@ -5,20 +5,6 @@* Copyright IBM Corp. 2003, 2009 * * 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 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. */ #include <linux/module.h>
drivers/s390/virtio/Makefile +0 -4
@@ -2,9 +2,5 @@ # Makefile for kvm guest drivers 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. obj-$(CONFIG_S390_GUEST) += virtio_ccw.o
drivers/s390/virtio/virtio_ccw.c +0 -4
@@ -4,10 +4,6 @@* * Copyright IBM Corp. 2012, 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]> */
Signature · 1 line
2.15.0
Re: [PATCH 9/9] s390: drivers: Remove redundant license text
Quoted 21 lines · On Tue, 14 Nov 2017 18:38:08 +0100 Greg Kroah-Hartman…
Now that the SPDX tag is in all
drivers/s390/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 Sebastian Ott <[email protected]>Cc Peter Oberparleiter <[email protected]>Cc Julian Wiedmann <[email protected]>Cc Ursula Braun <[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]>
Quoted 12 lines
--- drivers/s390/char/zcore.c | 1 - drivers/s390/cio/cmf.c | 14 -------------- drivers/s390/cio/css.c | 2 -- drivers/s390/cio/device.c | 2 -- drivers/s390/cio/device_ops.c | 2 -- drivers/s390/net/lcs.c | 14 -------------- drivers/s390/net/netiucv.c | 15 --------------- drivers/s390/net/smsgiucv.c | 14 -------------- drivers/s390/virtio/Makefile | 4 ---- drivers/s390/virtio/virtio_ccw.c | 4 ---- 10 files changed, 72 deletions(-)
Quoted 14 lines · Greg Kroah-Hartman
Hi all,
Here are 9 patches against linux-next of today that add SPDX identifiers to the remaining files 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.
Quoted 10 lines
Greg Kroah-Hartman (9):
s390: block: add SPDX identifiers to the remaining files
s390: crypto: add SPDX identifiers to the remaining files
s390: cio: add SPDX identifiers to the remaining files
s390: char: add SPDX identifiers to the remaining files
s390: net: add SPDX identifiers to the remaining files
s390: scsi:zfcp_aux: add SPDX identifier
s390: virtio: add SPDX identifiers to the remaining files
s390: crypto: Remove redundant license text
s390: drivers: Remove redundant license text
Whole series applied. Thank you!
Will you or Thomas also provide patches for arch/s390? Or should we take care of that on our own?
Quoted 26 lines · Heiko Carstens
Quoted 14 lines · Greg Kroah-Hartman
Hi all,
Here are 9 patches against linux-next of today that add SPDX identifiers to the remaining files 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.
Quoted 10 lines
Greg Kroah-Hartman (9):
s390: block: add SPDX identifiers to the remaining files
s390: crypto: add SPDX identifiers to the remaining files
s390: cio: add SPDX identifiers to the remaining files
s390: char: add SPDX identifiers to the remaining files
s390: net: add SPDX identifiers to the remaining files
s390: scsi:zfcp_aux: add SPDX identifier
s390: virtio: add SPDX identifiers to the remaining files
s390: crypto: Remove redundant license text
s390: drivers: Remove redundant license text
Quoted 4 lines
Whole series applied. Thank you!
Will you or Thomas also provide patches for
arch/s390? Or should we take care of that on our own?
I can do that if you want me to, just let me know.
thanks,
greg k-h
Quoted 27 lines · Greg Kroah-Hartman
Quoted 26 lines · Heiko Carstens
Quoted 24 lines · Greg Kroah-Hartman
Hi all,
Here are 9 patches against linux-next of today that add SPDX identifiers to the remaining files 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 (9):
s390: block: add SPDX identifiers to the remaining files
s390: crypto: add SPDX identifiers to the remaining files
s390: cio: add SPDX identifiers to the remaining files
s390: char: add SPDX identifiers to the remaining files
s390: net: add SPDX identifiers to the remaining files
s390: scsi:zfcp_aux: add SPDX identifier
s390: virtio: add SPDX identifiers to the remaining files
s390: crypto: Remove redundant license text
s390: drivers: Remove redundant license text
Quoted 6 lines
Quoted 4 lines
Whole series applied. Thank you!
Will you or Thomas also provide patches for
arch/s390? Or should we take care of that on our own?I can do that if you want me to, just let me know.
Yes, please. As I understand it you have all the scripts in place which should just work and provide the correct result.
Thank you!
Quoted 30 lines · Heiko Carstens
Quoted 29 lines · Greg Kroah-Hartman
Quoted 28 lines · Heiko Carstens
Quoted 14 lines · Greg Kroah-Hartman
Hi all,
Here are 9 patches against linux-next of today that add SPDX identifiers to the remaining files 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.
Quoted 10 lines
Greg Kroah-Hartman (9):
s390: block: add SPDX identifiers to the remaining files
s390: crypto: add SPDX identifiers to the remaining files
s390: cio: add SPDX identifiers to the remaining files
s390: char: add SPDX identifiers to the remaining files
s390: net: add SPDX identifiers to the remaining files
s390: scsi:zfcp_aux: add SPDX identifier
s390: virtio: add SPDX identifiers to the remaining files
s390: crypto: Remove redundant license text
s390: drivers: Remove redundant license textWhole series applied. Thank you!
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Will you or Thomas also provide patches for
arch/s390? Or should we take care of that on our own?I can do that if you want me to, just let me know.
Yes, please. As I understand it you have all the scripts in place which should just work and provide the correct result.
Ok, will do.
greg k-h
Quoted 30 lines · Heiko Carstens
Quoted 29 lines · Greg Kroah-Hartman
Quoted 28 lines · Heiko Carstens
Quoted 14 lines · Greg Kroah-Hartman
Hi all,
Here are 9 patches against linux-next of today that add SPDX identifiers to the remaining files 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.
Quoted 10 lines
Greg Kroah-Hartman (9):
s390: block: add SPDX identifiers to the remaining files
s390: crypto: add SPDX identifiers to the remaining files
s390: cio: add SPDX identifiers to the remaining files
s390: char: add SPDX identifiers to the remaining files
s390: net: add SPDX identifiers to the remaining files
s390: scsi:zfcp_aux: add SPDX identifier
s390: virtio: add SPDX identifiers to the remaining files
s390: crypto: Remove redundant license text
s390: drivers: Remove redundant license textWhole series applied. Thank you!
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Will you or Thomas also provide patches for
arch/s390? Or should we take care of that on our own?I can do that if you want me to, just let me know.
Yes, please. As I understand it you have all the scripts in place which should just work and provide the correct result.
Now sent, thanks.
greg k-h