Re: [PATCH 5/9] s390: net: add SPDX identifiers to the remaining files
On Tue, Nov 14, 2017 at 09:22:49PM +0100, Heiko Carstens wrote: > On Tue, Nov 14, 2017 at 06:38:04PM +0100, Greg Kroah-Hartman wrote: > > 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> > Cc: Ursula Braun > > Cc: Martin Schwidefsky > > Cc: Heiko Carstens > > Cc: Thomas Gleixner > > Cc: Kate Stewart > > Cc: Philippe Ombredanne > > Signed-off-by: Greg Kroah-Hartman > > --- > > diff --git a/drivers/s390/net/fsm.c b/drivers/s390/net/fsm.c > > index 8c14c6c3ad3d..f0c7c182b077 100644 > > --- a/drivers/s390/net/fsm.c > > +++ b/drivers/s390/net/fsm.c > > @@ -1,3 +1,4 @@ > > > > +// SPDX-License-Identifier: GPL-2.0 > > /** > > * A generic FSM based on fsm used in isdn4linux > > * > > 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. 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
Re: [PATCH 5/9] s390: net: add SPDX identifiers to the remaining files
On Tue, Nov 14, 2017 at 09:22:49PM +0100, Heiko Carstens wrote: > On Tue, Nov 14, 2017 at 06:38:04PM +0100, Greg Kroah-Hartman wrote: > > 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 > > Cc: Ursula Braun > > Cc: Martin Schwidefsky > > Cc: Heiko Carstens > > Cc: Thomas Gleixner > > Cc: Kate Stewart > > Cc: Philippe Ombredanne > > Signed-off-by: Greg Kroah-Hartman > > --- > > diff --git a/drivers/s390/net/fsm.c b/drivers/s390/net/fsm.c > > index 8c14c6c3ad3d..f0c7c182b077 100644 > > --- a/drivers/s390/net/fsm.c > > +++ b/drivers/s390/net/fsm.c > > @@ -1,3 +1,4 @@ > > > > +// SPDX-License-Identifier: GPL-2.0 > > /** > > * A generic FSM based on fsm used in isdn4linux > > * > > 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. 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
Re: [PATCH 5/9] s390: net: add SPDX identifiers to the remaining files
On Tue, Nov 14, 2017 at 06:38:04PM +0100, Greg Kroah-Hartman wrote: > 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> Cc: Ursula Braun > Cc: Martin Schwidefsky > Cc: Heiko Carstens > Cc: Thomas Gleixner > Cc: Kate Stewart > Cc: Philippe Ombredanne > Signed-off-by: Greg Kroah-Hartman > --- > diff --git a/drivers/s390/net/fsm.c b/drivers/s390/net/fsm.c > index 8c14c6c3ad3d..f0c7c182b077 100644 > --- a/drivers/s390/net/fsm.c > +++ b/drivers/s390/net/fsm.c > @@ -1,3 +1,4 @@ > > +// SPDX-License-Identifier: GPL-2.0 > /** > * A generic FSM based on fsm used in isdn4linux > * 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
On Tue, Nov 14, 2017 at 06:38:04PM +0100, Greg Kroah-Hartman wrote: > 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 > Cc: Ursula Braun > Cc: Martin Schwidefsky > Cc: Heiko Carstens > Cc: Thomas Gleixner > Cc: Kate Stewart > Cc: Philippe Ombredanne > Signed-off-by: Greg Kroah-Hartman > --- > diff --git a/drivers/s390/net/fsm.c b/drivers/s390/net/fsm.c > index 8c14c6c3ad3d..f0c7c182b077 100644 > --- a/drivers/s390/net/fsm.c > +++ b/drivers/s390/net/fsm.c > @@ -1,3 +1,4 @@ > > +// SPDX-License-Identifier: GPL-2.0 > /** > * A generic FSM based on fsm used in isdn4linux > * 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.
[PATCH 5/9] s390: net: 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/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 WiedmannCc: Ursula Braun Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: Thomas Gleixner Cc: Kate Stewart Cc: Philippe Ombredanne Signed-off-by: Greg Kroah-Hartman --- 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(+) diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c index be9f17218531..7ce98b70cad3 100644 --- a/drivers/s390/net/ctcm_main.c +++ b/drivers/s390/net/ctcm_main.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright IBM Corp. 2001, 2009 * Author(s): diff --git a/drivers/s390/net/fsm.c b/drivers/s390/net/fsm.c index 8c14c6c3ad3d..f0c7c182b077 100644 --- a/drivers/s390/net/fsm.c +++ b/drivers/s390/net/fsm.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /** * A generic FSM based on fsm used in isdn4linux * diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c index e131a03262ad..36899e94d268 100644 --- a/drivers/s390/net/lcs.c +++ b/drivers/s390/net/lcs.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Linux for S/390 Lan Channel Station Network Driver * diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c index b9c7c1e61da2..150053131baf 100644 --- a/drivers/s390/net/netiucv.c +++ b/drivers/s390/net/netiucv.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * IUCV network driver * diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index 49b9efeba1bd..98a7f84540ab 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* *Copyright IBM Corp. 2007, 2009 *Author(s): Utz Bacher , diff --git a/drivers/s390/net/qeth_core_sys.c b/drivers/s390/net/qeth_core_sys.c index b22ed2a57acd..ae81534de912 100644 --- a/drivers/s390/net/qeth_core_sys.c +++ b/drivers/s390/net/qeth_core_sys.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* *Copyright IBM Corp. 2007 *Author(s): Utz Bacher , diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c index d2537c09126d..93d7e345d180 100644 --- a/drivers/s390/net/qeth_l2_main.c +++ b/drivers/s390/net/qeth_l2_main.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* *Copyright IBM Corp. 2007, 2009 *Author(s): Utz Bacher , diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c index aadd384316a3..0f8c12738b06 100644 --- a/drivers/s390/net/qeth_l3_main.c +++ b/drivers/s390/net/qeth_l3_main.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* *Copyright IBM Corp. 2007, 2009 *Author(s): Utz Bacher , diff --git a/drivers/s390/net/smsgiucv.c b/drivers/s390/net/smsgiucv.c index a851d34c642b..93405e0bad3c 100644 --- a/drivers/s390/net/smsgiucv.c +++ b/drivers/s390/net/smsgiucv.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * IUCV special message driver * diff --git a/drivers/s390/net/smsgiucv_app.c b/drivers/s390/net/smsgiucv_app.c index 32515a201bbc..0a263999f7ae 100644 --- a/drivers/s390/net/smsgiucv_app.c +++ b/drivers/s390/net/smsgiucv_app.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Deliver z/VM CP special messages (SMSG) as uevents. * -- 2.15.0
[PATCH 5/9] s390: net: 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/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 Cc: Ursula Braun Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: Thomas Gleixner Cc: Kate Stewart Cc: Philippe Ombredanne Signed-off-by: Greg Kroah-Hartman --- 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(+) diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c index be9f17218531..7ce98b70cad3 100644 --- a/drivers/s390/net/ctcm_main.c +++ b/drivers/s390/net/ctcm_main.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright IBM Corp. 2001, 2009 * Author(s): diff --git a/drivers/s390/net/fsm.c b/drivers/s390/net/fsm.c index 8c14c6c3ad3d..f0c7c182b077 100644 --- a/drivers/s390/net/fsm.c +++ b/drivers/s390/net/fsm.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /** * A generic FSM based on fsm used in isdn4linux * diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c index e131a03262ad..36899e94d268 100644 --- a/drivers/s390/net/lcs.c +++ b/drivers/s390/net/lcs.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Linux for S/390 Lan Channel Station Network Driver * diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c index b9c7c1e61da2..150053131baf 100644 --- a/drivers/s390/net/netiucv.c +++ b/drivers/s390/net/netiucv.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * IUCV network driver * diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index 49b9efeba1bd..98a7f84540ab 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* *Copyright IBM Corp. 2007, 2009 *Author(s): Utz Bacher , diff --git a/drivers/s390/net/qeth_core_sys.c b/drivers/s390/net/qeth_core_sys.c index b22ed2a57acd..ae81534de912 100644 --- a/drivers/s390/net/qeth_core_sys.c +++ b/drivers/s390/net/qeth_core_sys.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* *Copyright IBM Corp. 2007 *Author(s): Utz Bacher , diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c index d2537c09126d..93d7e345d180 100644 --- a/drivers/s390/net/qeth_l2_main.c +++ b/drivers/s390/net/qeth_l2_main.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* *Copyright IBM Corp. 2007, 2009 *Author(s): Utz Bacher , diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c index aadd384316a3..0f8c12738b06 100644 --- a/drivers/s390/net/qeth_l3_main.c +++ b/drivers/s390/net/qeth_l3_main.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* *Copyright IBM Corp. 2007, 2009 *Author(s): Utz Bacher , diff --git a/drivers/s390/net/smsgiucv.c b/drivers/s390/net/smsgiucv.c index a851d34c642b..93405e0bad3c 100644 --- a/drivers/s390/net/smsgiucv.c +++ b/drivers/s390/net/smsgiucv.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * IUCV special message driver * diff --git a/drivers/s390/net/smsgiucv_app.c b/drivers/s390/net/smsgiucv_app.c index 32515a201bbc..0a263999f7ae 100644 --- a/drivers/s390/net/smsgiucv_app.c +++ b/drivers/s390/net/smsgiucv_app.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Deliver z/VM CP special messages (SMSG) as uevents. * -- 2.15.0