SPDX license identifiers in all DD drivers

PATCH In review Daniel Scheller 3 participants 11 messages Mar 20, 2018 – Mar 21, 2018

Subsystems (6)

Media (V4L/DVB) Media drivers for digital devices PCIe devices Media drivers for ST STV0910 demodulator ICs Media drivers for MXL5XX tuner demodulators +2 more subsystems

lore

Share & tools

lore

Daniel Scheller

author

2018-03-20 21:01 UTC #0 lore raw

cover SPDX license identifiers in all DD drivers

From: Daniel Scheller <[email protected]>

This series adds SPDX license identifiers to all source files which are copyright by either Digital Devices GmbH or Metzlerbros GbR, who are the original authors of the ddbridge, ngene, cxd2099, mxl5xx, stv0910 and stv6111 bridge/demod/tuner drivers, with the mxl5xx driver being based on source code released by MaxLinear.

All source code either carries the license text "redistribute and/or modify it under the terms of the GNU GPL version 2 only as published by the FSF", or simply "... GPL version 2" in the case of the mxl5xx driver, which all should equal to the SPDX License Identifier "GPL-2.0-only" as of SPDX License List Version 3.0 published on December the 28th, 2017, which is applied as license tag to all files of the mentioned drivers by this series.

During checking of those modules I noticed that the module info carries the "GPL" version tag, which, according to include/linux/module.h, equals to "GPL version 2 or later", which (I believe) in turn is a mismatch to what is written in the file header's license boilerplates. This series corrects this by setting all MODULE_LICENSE() descriptors to "GPL v2", which equals to the "GNU GPL version 2 only" phrase.

Besides that, this fixes some whitespace cosmetics in the headers, and removes the link to gnu.org (if existing), which points to the GPLv3 license anyway.

The original intention was to fully replace all the licensing headers with only the SPDX License Identifiers as it is done in a lot of other in-tree drivers nowadays. However, Digital Devices disagreed to do this and expressed major concerns regarding this, in that a machine readable license tag instead of a full license boilerplate won't hold up equally, so we agreed to keep the license boilerplate text as is right now.

Greg, I'm Cc'ing you on this due to the last paragraph, as AFAIK you're one of the initiators of the SPDX tagging initiative, and you even added tags to 10k+ files all over the tree :-) so we maybe can discuss this further, also with DD, in the hopes you're fine with this - sorry in advance if not.

Ralph, Manfred, I'm Cc'ing you on these five patches aswell, so if there are any concerns left regarding the changes proposed by these patches, please raise them.

Daniel Scheller (5):
[media] stv0910/stv6111: add SPDX license headers [media] dvb-frontends/mxl5xx: add SPDX license headers [media] dvb-frontends/cxd2099: add SPDX license headers [media] ddbridge: add SPDX license headers [media] ngene: add SPDX license headers

 drivers/media/dvb-frontends/cxd2099.c      |  5 +++--
 drivers/media/dvb-frontends/cxd2099.h      |  3 ++-
 drivers/media/dvb-frontends/mxl5xx.c       |  6 +++---
 drivers/media/dvb-frontends/mxl5xx.h       | 13 +++++++++++++
 drivers/media/dvb-frontends/mxl5xx_defs.h  |  1 +
 drivers/media/dvb-frontends/mxl5xx_regs.h  |  4 ++--
 drivers/media/dvb-frontends/stv0910.c      |  5 +++--
 drivers/media/dvb-frontends/stv0910.h      |  9 +++++++++
 drivers/media/dvb-frontends/stv6111.c      |  6 +++---
 drivers/media/dvb-frontends/stv6111.h      |  7 +++++++
 drivers/media/pci/ddbridge/Makefile        |  2 +-
 drivers/media/pci/ddbridge/ddbridge-ci.c   |  6 ++----
 drivers/media/pci/ddbridge/ddbridge-ci.h   |  6 ++----
 drivers/media/pci/ddbridge/ddbridge-core.c |  8 ++------
 drivers/media/pci/ddbridge/ddbridge-hw.c   |  4 ++--
 drivers/media/pci/ddbridge/ddbridge-hw.h   |  4 ++--
 drivers/media/pci/ddbridge/ddbridge-i2c.c  |  4 ++--
 drivers/media/pci/ddbridge/ddbridge-i2c.h  |  4 ++--
 drivers/media/pci/ddbridge/ddbridge-io.h   |  4 ++--
 drivers/media/pci/ddbridge/ddbridge-main.c |  8 ++++----
 drivers/media/pci/ddbridge/ddbridge-max.c  |  4 ++--
 drivers/media/pci/ddbridge/ddbridge-max.h  |  4 ++--
 drivers/media/pci/ddbridge/ddbridge-regs.h |  7 ++-----
 drivers/media/pci/ddbridge/ddbridge.h      |  7 ++-----
 drivers/media/pci/ngene/Makefile           |  2 +-
 drivers/media/pci/ngene/ngene-cards.c      | 10 +++-------
 drivers/media/pci/ngene/ngene-core.c       |  8 ++------
 drivers/media/pci/ngene/ngene-dvb.c        |  8 ++------
 drivers/media/pci/ngene/ngene-i2c.c        |  8 ++------
 drivers/media/pci/ngene/ngene.h            |  7 ++-----
 30 files changed, 87 insertions(+), 87 deletions(-)

Signature · 1 line

2.16.1

Daniel Scheller

author

2018-03-20 21:01 UTC #1 lore raw

PATCH 1/5 stv0910/stv6111: add SPDX license headers

From: Daniel Scheller <[email protected]>

Add SPDX license headers to the stv0910 and stv6111 DVB frontend drivers. Both drivers are licensed as GPL-2.0-only, so fix this in the MODULE_LICENSE while at it. Also, the includes were lacking any license headers at all, so add them now.

Signed-off-by Daniel Scheller <[email protected]>

---
 drivers/media/dvb-frontends/stv0910.c | 5 +++--
 drivers/media/dvb-frontends/stv0910.h | 9 +++++++++
 drivers/media/dvb-frontends/stv6111.c | 6 +++---
 drivers/media/dvb-frontends/stv6111.h | 7 +++++++
 4 files changed, 22 insertions(+), 5 deletions(-)

drivers/media/dvb-frontends/stv0910.c +3 -2

index 52355c14fd64..ce82264e99ef 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Driver for the ST STV0910 DVB-S/S2 demodulator.
  *

@@ -11,7 +12,7 @@
  *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  */

@@ -1836,4 +1837,4 @@ EXPORT_SYMBOL_GPL(stv0910_attach);
 
 MODULE_DESCRIPTION("ST STV0910 multistandard frontend driver");
 MODULE_AUTHOR("Ralph and Marcus Metzler, Manfred Voelkel");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");

drivers/media/dvb-frontends/stv0910.h +9 -0

index fccd8d9b665f..93de08540ce4 100644
@@ -1,3 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Driver for the ST STV0910 DVB-S/S2 demodulator.
+ *
+ * Copyright (C) 2014-2015 Ralph Metzler <[email protected]>
+ *                         Marcus Metzler <[email protected]>
+ *                         developed for Digital Devices GmbH
+ */
+
 #ifndef _STV0910_H_
 #define _STV0910_H_

drivers/media/dvb-frontends/stv6111.c +3 -3

index 9b715b6fe152..47f4da2e577c 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Driver for the ST STV6111 tuner
  *

@@ -9,9 +10,8 @@
  *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
  */
 
 #include <linux/kernel.h>

@@ -688,4 +688,4 @@ EXPORT_SYMBOL_GPL(stv6111_attach);
 
 MODULE_DESCRIPTION("ST STV6111 satellite tuner driver");
 MODULE_AUTHOR("Ralph Metzler, Manfred Voelkel");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");

drivers/media/dvb-frontends/stv6111.h +7 -0

index 5bc1228dc9bd..d2552040eddd 100644
@@ -1,3 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Driver for the ST STV6111 tuner
+ *
+ * Copyright (C) 2014 Digital Devices GmbH
+ */
+
 #ifndef _STV6111_H_
 #define _STV6111_H_

Signature · 1 line

2.16.1

Greg KH

2018-03-21 09:47 UTC #2 lore raw

Re: [PATCH 1/5] [media] stv0910/stv6111: add SPDX license headers

Quoted 20 lines · Daniel Scheller

From: Daniel Scheller <[email protected]>
Add SPDX license headers to the stv0910 and stv6111 DVB frontend drivers. Both drivers are licensed as GPL-2.0-only, so fix this in the MODULE_LICENSE while at it. Also, the includes were lacking any license headers at all, so add them now.
Signed-off-by Daniel Scheller <[email protected]>
---
 drivers/media/dvb-frontends/stv0910.c | 5 +++--
 drivers/media/dvb-frontends/stv0910.h | 9 +++++++++
 drivers/media/dvb-frontends/stv6111.c | 6 +++---
 drivers/media/dvb-frontends/stv6111.h | 7 +++++++
 4 files changed, 22 insertions(+), 5 deletions(-)
drivers/media/dvb-frontends/stv0910.c +0 -0
index 52355c14fd64..ce82264e99ef 100644

drivers/media/dvb-frontends/stv0910.c line 1

Quoted 1 line

drivers/media/dvb-frontends/stv0910.c +1 -0
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only

Please only use the identifiers documented in Documentation/process/license-rules.rst right now. We wrote and got that merged _before_ SPDX bumped the tags to 3.0 which added the (imo crazy) -only variants.

So please stick with what is already in the kernel tree, if we do decide to update to a newer version of SPDX, we will hit the tree all at once with a script to give to Linus to run.

drivers/media/dvb-frontends/stv0910.c line 15

Quoted 9 lines

drivers/media/dvb-frontends/stv0910.c +1 -1

 /*
  * Driver for the ST STV0910 DVB-S/S2 demodulator.
  *

@@ -11,7 +12,7 @@
  *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

Why did you change this in this patch?

Please only do "one" thing per patch.

drivers/media/dvb-frontends/stv0910.c EXPORT_SYMBOL_GPL(stv0910_attach); · line 1840

Quoted 9 lines

drivers/media/dvb-frontends/stv0910.c +1 -1

  * GNU General Public License for more details.
  */

@@ -1836,4 +1837,4 @@ EXPORT_SYMBOL_GPL(stv0910_attach);
 
 MODULE_DESCRIPTION("ST STV0910 multistandard frontend driver");
 MODULE_AUTHOR("Ralph and Marcus Metzler, Manfred Voelkel");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");

Again, this should be a separate patch.

drivers/media/dvb-frontends/stv0910.h line 8

Quoted 13 lines

drivers/media/dvb-frontends/stv0910.h +8 -0

index fccd8d9b665f..93de08540ce4 100644
@@ -1,3 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Driver for the ST STV0910 DVB-S/S2 demodulator.
+ *
+ * Copyright (C) 2014-2015 Ralph Metzler <[email protected]>
+ *                         Marcus Metzler <[email protected]>
+ *                         developed for Digital Devices GmbH
+ */

Where did that copyright notice come from?

This patch is a total mix of different things, please do not do that at all!

thanks,

greg k-h

Daniel Scheller

author

2018-03-20 21:01 UTC #3 lore raw

PATCH 2/5 dvb-frontends/mxl5xx: add SPDX license headers

In reply to Daniel Scheller

From: Daniel Scheller <[email protected]>

Add SPDX license headers to the mxl5xx DVB frontend driver and it's related includes, and fix MODULE_LICENSE while at it.

Signed-off-by Daniel Scheller <[email protected]>

---
 drivers/media/dvb-frontends/mxl5xx.c      |  6 +++---
 drivers/media/dvb-frontends/mxl5xx.h      | 13 +++++++++++++
 drivers/media/dvb-frontends/mxl5xx_defs.h |  1 +
 drivers/media/dvb-frontends/mxl5xx_regs.h |  4 ++--
 4 files changed, 19 insertions(+), 5 deletions(-)

drivers/media/dvb-frontends/mxl5xx.c +3 -3

index 483ee7d6198e..57ea61f53dbe 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Driver for the MaxLinear MxL5xx family of tuners/demods
  *

@@ -15,9 +16,8 @@
  *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
  */
 
 #include <linux/kernel.h>

@@ -1895,4 +1895,4 @@ EXPORT_SYMBOL_GPL(mxl5xx_attach);
 
 MODULE_DESCRIPTION("MaxLinear MxL5xx DVB-S/S2 tuner-demodulator driver");
 MODULE_AUTHOR("Ralph and Marcus Metzler, Metzler Brothers Systementwicklung GbR");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");

drivers/media/dvb-frontends/mxl5xx.h +13 -0

index ad4c21846800..34e786dc7bb9 100644
@@ -1,3 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Driver for the MaxLinear MxL5xx family of tuners/demods
+ *
+ * Copyright (C) 2014-2015 Ralph Metzler <[email protected]>
+ *                         Marcus Metzler <[email protected]>
+ *                         developed for Digital Devices GmbH
+ *
+ * based on code:
+ * Copyright (c) 2011-2013 MaxLinear, Inc. All rights reserved
+ * which was released under GPL V2
+ */
+
 #ifndef _MXL5XX_H_
 #define _MXL5XX_H_

drivers/media/dvb-frontends/mxl5xx_defs.h +1 -0

index fd9e61e0188f..a6062b4b39cb 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Defines for the Maxlinear MX58x family of tuners/demods
  *

drivers/media/dvb-frontends/mxl5xx_regs.h +2 -2

index 5001dafe1ba8..d231151c437f 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2011-2013 MaxLinear, Inc. All rights reserved
  *

@@ -9,11 +10,10 @@
  *
  * 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.
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  *
  * This program may alternatively be licensed under a proprietary license from
  * MaxLinear, Inc.
- *
  */
 
 #ifndef __MXL58X_REGISTERS_H__

Signature · 1 line

2.16.1

Daniel Scheller

author

2018-03-20 21:01 UTC #4 lore raw

PATCH 3/5 dvb-frontends/cxd2099: add SPDX license headers

In reply to Daniel Scheller

From: Daniel Scheller <[email protected]>

Add SPDX license headers in the cxd2099 driver files and fix MODULE_LICENSE accordingly.

Cc Jasmin Jessich <[email protected]>

Signed-off-by Daniel Scheller <[email protected]>

---
 drivers/media/dvb-frontends/cxd2099.c | 5 +++--
 drivers/media/dvb-frontends/cxd2099.h | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

drivers/media/dvb-frontends/cxd2099.c +3 -2

index 4a0ce3037fd6..6b5f7fdde77b 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * cxd2099.c: Driver for the Sony CXD2099AR Common Interface Controller
  *

@@ -9,7 +10,7 @@
  *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  */

@@ -701,4 +702,4 @@ module_i2c_driver(cxd2099_driver);
 
 MODULE_DESCRIPTION("Sony CXD2099AR Common Interface controller driver");
 MODULE_AUTHOR("Ralph Metzler");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");

drivers/media/dvb-frontends/cxd2099.h +2 -1

index ec1910dec3f3..094bf4ffe2a8 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * cxd2099.h: Driver for the Sony CXD2099AR Common Interface Controller
  *

@@ -9,7 +10,7 @@
  *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  */

Signature · 1 line

2.16.1

Daniel Scheller

author

2018-03-20 21:01 UTC #5 lore raw

PATCH 4/5 ddbridge: add SPDX license headers

In reply to Daniel Scheller

From: Daniel Scheller <[email protected]>

Add SPDX license headers in all ddbridge driver files and fix MODULE_LICENSE accordingly. Also, apply some cosmetics to the file headers.

Signed-off-by Daniel Scheller <[email protected]>

---
 drivers/media/pci/ddbridge/Makefile        | 2 +-
 drivers/media/pci/ddbridge/ddbridge-ci.c   | 6 ++----
 drivers/media/pci/ddbridge/ddbridge-ci.h   | 6 ++----
 drivers/media/pci/ddbridge/ddbridge-core.c | 8 ++------
 drivers/media/pci/ddbridge/ddbridge-hw.c   | 4 ++--
 drivers/media/pci/ddbridge/ddbridge-hw.h   | 4 ++--
 drivers/media/pci/ddbridge/ddbridge-i2c.c  | 4 ++--
 drivers/media/pci/ddbridge/ddbridge-i2c.h  | 4 ++--
 drivers/media/pci/ddbridge/ddbridge-io.h   | 4 ++--
 drivers/media/pci/ddbridge/ddbridge-main.c | 8 ++++----
 drivers/media/pci/ddbridge/ddbridge-max.c  | 4 ++--
 drivers/media/pci/ddbridge/ddbridge-max.h  | 4 ++--
 drivers/media/pci/ddbridge/ddbridge-regs.h | 7 ++-----
 drivers/media/pci/ddbridge/ddbridge.h      | 7 ++-----
 14 files changed, 29 insertions(+), 43 deletions(-)

drivers/media/pci/ddbridge/Makefile +1 -1

index 745b37d07558..c79bbc6d6276 100644
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Makefile for the ddbridge device driver
 #

drivers/media/pci/ddbridge/ddbridge-ci.c +2 -4

index cfe23d02e561..99a2d36e93b3 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * ddbridge-ci.c: Digital Devices bridge CI (DuoFlex, CI Bridge) support
  *

@@ -11,11 +12,8 @@
  *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
- * To obtain the license, point your browser to
- * http://www.gnu.org/copyleft/gpl.html
  */
 
 #include "ddbridge.h"

drivers/media/pci/ddbridge/ddbridge-ci.h +2 -4

index 35a39182dd83..1458b38d82e7 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * ddbridge-ci.h: Digital Devices bridge CI (DuoFlex, CI Bridge) support
  *

@@ -11,11 +12,8 @@
  *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
- * To obtain the license, point your browser to
- * http://www.gnu.org/copyleft/gpl.html
  */
 
 #ifndef __DDBRIDGE_CI_H__

drivers/media/pci/ddbridge/ddbridge-core.c +2 -6

index 90687eff5909..2ec84ca516f1 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * ddbridge-core.c: Digital Devices bridge core functions
  *

@@ -5,19 +6,14 @@
  *                         Marcus Metzler <[email protected]>
  *                         Ralph Metzler <[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.
  *
- *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
- * To obtain the license, point your browser to
- * http://www.gnu.org/copyleft/gpl.html
  */
 
 #include <linux/module.h>

drivers/media/pci/ddbridge/ddbridge-hw.c +2 -2

index c6d14925e2fc..be3eaf682455 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * ddbridge-hw.c: Digital Devices bridge hardware maps
  *

@@ -11,9 +12,8 @@
  *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
  */
 
 #include "ddbridge.h"

drivers/media/pci/ddbridge/ddbridge-hw.h +2 -2

index 7c142419419c..79e76bf293a3 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * ddbridge-hw.h: Digital Devices bridge hardware maps
  *

@@ -11,9 +12,8 @@
  *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
  */
 
 #ifndef _DDBRIDGE_HW_H_

drivers/media/pci/ddbridge/ddbridge-i2c.c +2 -2

index 82a9a0e806fc..e87ae4a1849f 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * ddbridge-i2c.c: Digital Devices bridge i2c driver
  *

@@ -11,9 +12,8 @@
  *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
  */
 
 #include <linux/module.h>

drivers/media/pci/ddbridge/ddbridge-i2c.h +2 -2

index 7ed220506c05..8d0d1674cf81 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * ddbridge-i2c.c: Digital Devices bridge i2c driver
  *

@@ -11,9 +12,8 @@
  *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
  */
 
 #ifndef __DDBRIDGE_I2C_H__

drivers/media/pci/ddbridge/ddbridge-io.h +2 -2

index b3646c04f1a7..eaf08fc3b48d 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * ddbridge-io.h: Digital Devices bridge I/O inline functions
  *

@@ -11,9 +12,8 @@
  *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
  */
 
 #ifndef __DDBRIDGE_IO_H__

drivers/media/pci/ddbridge/ddbridge-main.c +4 -4

index 26497d6b1395..39e14a9306ad 100644
@@ -1,5 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
- * ddbridge.c: Digital Devices PCIe bridge driver
+ * ddbridge-main.c: Digital Devices PCIe bridge driver
  *
  * Copyright (C) 2010-2017 Digital Devices GmbH
  *                         Ralph Metzler <[email protected]>

@@ -11,9 +12,8 @@
  *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

@@ -343,5 +343,5 @@ module_exit(module_exit_ddbridge);
 
 MODULE_DESCRIPTION("Digital Devices PCIe Bridge");
 MODULE_AUTHOR("Ralph and Marcus Metzler, Metzler Brothers Systementwicklung GbR");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 MODULE_VERSION(DDBRIDGE_VERSION);

drivers/media/pci/ddbridge/ddbridge-max.c +2 -2

index dc6b81488746..e68155e8ddbb 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * ddbridge-max.c: Digital Devices bridge MAX card support
  *

@@ -11,9 +12,8 @@
  *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
  */
 
 #include <linux/module.h>

drivers/media/pci/ddbridge/ddbridge-max.h +2 -2

index bf8bf38739f6..429ad662c3fe 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * ddbridge-max.h: Digital Devices bridge MAX card support
  *

@@ -11,9 +12,8 @@
  *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
  */
 
 #ifndef _DDBRIDGE_MAX_H_

drivers/media/pci/ddbridge/ddbridge-regs.h +2 -5

index b978b5991940..abf7a944eea4 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * ddbridge-regs.h: Digital Devices PCIe bridge driver
  *

@@ -7,14 +8,10 @@
  * modify it under the terms of the GNU General Public License
  * version 2 only, as published by the Free Software Foundation.
  *
- *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
- * To obtain the license, point your browser to
- * http://www.gnu.org/copyleft/gpl.html
  */
 
 #ifndef __DDBRIDGE_REGS_H__

drivers/media/pci/ddbridge/ddbridge.h +2 -5

index f223dc6c9963..0e0ddacd0e80 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * ddbridge.h: Digital Devices PCIe bridge driver
  *

@@ -8,14 +9,10 @@
  * modify it under the terms of the GNU General Public License
  * version 2 only, as published by the Free Software Foundation.
  *
- *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
- * To obtain the license, point your browser to
- * http://www.gnu.org/copyleft/gpl.html
  */
 
 #ifndef _DDBRIDGE_H_

Signature · 1 line

2.16.1

Daniel Scheller

author

2018-03-20 21:01 UTC #6 lore raw

PATCH 5/5 ngene: add SPDX license headers

In reply to Daniel Scheller

From: Daniel Scheller <[email protected]>

Add SPDX license headers in all ngene driver files and fix MODULE_LICENSE accordingly.

Signed-off-by Daniel Scheller <[email protected]>

---
 drivers/media/pci/ngene/Makefile      |  2 +-
 drivers/media/pci/ngene/ngene-cards.c | 10 +++-------
 drivers/media/pci/ngene/ngene-core.c  |  8 ++------
 drivers/media/pci/ngene/ngene-dvb.c   |  8 ++------
 drivers/media/pci/ngene/ngene-i2c.c   |  8 ++------
 drivers/media/pci/ngene/ngene.h       |  7 ++-----
 6 files changed, 12 insertions(+), 31 deletions(-)

drivers/media/pci/ngene/Makefile +1 -1

index ec450ad19281..115152c96d50 100644
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Makefile for the nGene device driver
 #

drivers/media/pci/ngene/ngene-cards.c +3 -7

index 65fc8f23ad86..23fb6f33fa49 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * ngene-cards.c: nGene PCIe bridge driver - card specific info
  *

@@ -8,19 +9,14 @@
  *                         support for EEPROM-copying,
  *                         support for new dual DVB-S2 card prototype
  *
- *
  * 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.
  *
- *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
- * To obtain the license, point your browser to
- * http://www.gnu.org/copyleft/gpl.html
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

@@ -1265,4 +1261,4 @@ module_exit(module_exit_ngene);
 
 MODULE_DESCRIPTION("nGene");
 MODULE_AUTHOR("Micronas, Ralph Metzler, Manfred Voelkel");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");

drivers/media/pci/ngene/ngene-core.c +2 -6

index 3b9a1bfaf6c0..5da1c2b9732f 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * ngene.c: nGene PCIe bridge driver
  *

@@ -8,19 +9,14 @@
  *                         support for EEPROM-copying,
  *                         support for new dual DVB-S2 card prototype
  *
- *
  * 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.
  *
- *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
- * To obtain the license, point your browser to
- * http://www.gnu.org/copyleft/gpl.html
  */
 
 #include <linux/module.h>

drivers/media/pci/ngene/ngene-dvb.c +2 -6

index fee89b9ed9c1..fe250f4d37de 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * ngene-dvb.c: nGene PCIe bridge driver - DVB functions
  *

@@ -8,19 +9,14 @@
  *                         support for EEPROM-copying,
  *                         support for new dual DVB-S2 card prototype
  *
- *
  * 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.
  *
- *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
- * To obtain the license, point your browser to
- * http://www.gnu.org/copyleft/gpl.html
  */
 
 #include <linux/module.h>

drivers/media/pci/ngene/ngene-i2c.c +2 -6

index 092d46c2a3a9..f023a6764dd4 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * ngene-i2c.c: nGene PCIe bridge driver i2c functions
  *

@@ -8,19 +9,14 @@
  *                         support for EEPROM-copying,
  *                         support for new dual DVB-S2 card prototype
  *
- *
  * 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.
  *
- *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
- * To obtain the license, point your browser to
- * http://www.gnu.org/copyleft/gpl.html
  */
 
 /* FIXME - some of these can probably be removed */

drivers/media/pci/ngene/ngene.h +2 -5

index 01d9f1b58fcb..f1299f81ddf9 100644
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * ngene.h: nGene PCIe bridge driver
  *

@@ -7,14 +8,10 @@
  * modify it under the terms of the GNU General Public License
  * version 2 only, as published by the Free Software Foundation.
  *
- *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
- * To obtain the license, point your browser to
- * http://www.gnu.org/copyleft/gpl.html
  */
 
 #ifndef _NGENE_H_

Signature · 1 line

2.16.1

Greg KH

2018-03-21 09:49 UTC #7 lore raw

In reply to Daniel Scheller

Quoted 27 lines · Daniel Scheller

From: Daniel Scheller <[email protected]>
This series adds SPDX license identifiers to all source files which are copyright by either Digital Devices GmbH or Metzlerbros GbR, who are the original authors of the ddbridge, ngene, cxd2099, mxl5xx, stv0910 and stv6111 bridge/demod/tuner drivers, with the mxl5xx driver being based on source code released by MaxLinear.
All source code either carries the license text "redistribute and/or modify it under the terms of the GNU GPL version 2 only as published by the FSF", or simply "... GPL version 2" in the case of the mxl5xx driver, which all should equal to the SPDX License Identifier "GPL-2.0-only" as of SPDX License List Version 3.0 published on December the 28th, 2017, which is applied as license tag to all files of the mentioned drivers by this series.
During checking of those modules I noticed that the module info carries the "GPL" version tag, which, according to include/linux/module.h, equals to "GPL version 2 or later", which (I believe) in turn is a mismatch to what is written in the file header's license boilerplates. This series corrects this by setting all MODULE_LICENSE() descriptors to "GPL v2", which equals to the "GNU GPL version 2 only" phrase.
Besides that, this fixes some whitespace cosmetics in the headers, and removes the link to gnu.org (if existing), which points to the GPLv3 license anyway.

Quoted 6 lines

The original intention was to fully replace all the licensing headers with only the SPDX License Identifiers as it is done in a lot of other in-tree drivers nowadays. However, Digital Devices disagreed to do this and expressed major concerns regarding this, in that a machine readable license tag instead of a full license boilerplate won't hold up equally, so we agreed to keep the license boilerplate text as is right now.

That's really odd, who at that company can I talk to about this? Or really, what lawyer at that company can I point my lawyer at to talk about this, that's the only way this is going to get resolved.

If it helps, _ALL_ of the major companies that are kernel developers are onboard with the removal of the crazy boiler-plate text, so this tiny holdout should be easy to resolve.

Quoted 5 lines

Greg, I'm Cc'ing you on this due to the last paragraph, as AFAIK you're one of the initiators of the SPDX tagging initiative, and you even added tags to 10k+ files all over the tree :-) so we maybe can discuss this further, also with DD, in the hopes you're fine with this - sorry in advance if not.

See my review of your first patch here, this needs to be done a lot differently...

thanks,

greg k-h

Daniel Scheller

author

2018-03-21 17:29 UTC #8 lore raw

Hi Greg,

Am Wed, 21 Mar 2018 10:49:32 +0100
schrieb Greg KH <[email protected]>:

Quoted 16 lines · Daniel Scheller

Quoted 14 lines
From: Daniel Scheller <[email protected]>
This series adds SPDX license identifiers to all source files which are copyright by either Digital Devices GmbH or Metzlerbros GbR, who are the original authors of the ddbridge, ngene, cxd2099, mxl5xx, stv0910 and stv6111 bridge/demod/tuner drivers, with the mxl5xx driver being based on source code released by MaxLinear.
[...]
The original intention was to fully replace all the licensing headers with only the SPDX License Identifiers as it is done in a lot of other in-tree drivers nowadays. However, Digital Devices disagreed to do this and expressed major concerns regarding this, in that a machine readable license tag instead of a full license boilerplate won't hold up equally, so we agreed to keep the license boilerplate text as is right now.

Quoted 3 lines

That's really odd, who at that company can I talk to about this? Or really, what lawyer at that company can I point my lawyer at to talk about this, that's the only way this is going to get resolved.

I'm not entirely sure, but I guess for a first start it's best to contact Ralph (from Metzlerbros) and Manfred (from Digital Devices), being the authors and copyright owners of the DDDVB driver package where the drivers originate from and thus is the upstream for the mainlined copies of the mentioned drivers. Both are in the Cc list (rjkm and mvoelkel) of this thread.

Quoted 4 lines

If it helps, _ALL_ of the major companies that are kernel developers are onboard with the removal of the crazy boiler-plate text, so this tiny holdout should be easy to resolve.

Quoted 8 lines

Quoted 5 lines
Greg, I'm Cc'ing you on this due to the last paragraph, as AFAIK you're one of the initiators of the SPDX tagging initiative, and you even added tags to 10k+ files all over the tree :-) so we maybe can discuss this further, also with DD, in the hopes you're fine with this - sorry in advance if not.
See my review of your first patch here, this needs to be done a lot differently...

Check. Thanks for reviewing. The intent was to do a full cleanup of all licensing things in one go, per driver. Will do one patch for SPDX and eventual boilerplate cleanup for all drivers, one for MODULE_LICENSE and one for missing headers in the next iteration. Though I'd wait with that for now if you like to contact Ralph and Manfred, and do a v2 based on the outcome.

Thanks & best regards,
Daniel Scheller

Signature · 1 line

https://github.com/herrnst

Greg KH

2018-03-21 19:39 UTC #9 lore raw

Quoted 45 lines · Daniel Scheller

Hi Greg,
Am Wed, 21 Mar 2018 10:49:32 +0100
schrieb Greg KH <[email protected]>:
Quoted 16 lines · Daniel Scheller
Quoted 14 lines
From: Daniel Scheller <[email protected]>
This series adds SPDX license identifiers to all source files which are copyright by either Digital Devices GmbH or Metzlerbros GbR, who are the original authors of the ddbridge, ngene, cxd2099, mxl5xx, stv0910 and stv6111 bridge/demod/tuner drivers, with the mxl5xx driver being based on source code released by MaxLinear.
[...]
The original intention was to fully replace all the licensing headers with only the SPDX License Identifiers as it is done in a lot of other in-tree drivers nowadays. However, Digital Devices disagreed to do this and expressed major concerns regarding this, in that a machine readable license tag instead of a full license boilerplate won't hold up equally, so we agreed to keep the license boilerplate text as is right now.
Quoted 3 lines
That's really odd, who at that company can I talk to about this? Or really, what lawyer at that company can I point my lawyer at to talk about this, that's the only way this is going to get resolved.
I'm not entirely sure, but I guess for a first start it's best to contact Ralph (from Metzlerbros) and Manfred (from Digital Devices), being the authors and copyright owners of the DDDVB driver package where the drivers originate from and thus is the upstream for the mainlined copies of the mentioned drivers. Both are in the Cc list (rjkm and mvoelkel) of this thread.
Quoted 4 lines
If it helps, _ALL_ of the major companies that are kernel developers are onboard with the removal of the crazy boiler-plate text, so this tiny holdout should be easy to resolve.
Quoted 8 lines
Quoted 5 lines
Greg, I'm Cc'ing you on this due to the last paragraph, as AFAIK you're one of the initiators of the SPDX tagging initiative, and you even added tags to 10k+ files all over the tree :-) so we maybe can discuss this further, also with DD, in the hopes you're fine with this - sorry in advance if not.
See my review of your first patch here, this needs to be done a lot differently...

Quoted 6 lines

Check. Thanks for reviewing. The intent was to do a full cleanup of all licensing things in one go, per driver. Will do one patch for SPDX and eventual boilerplate cleanup for all drivers, one for MODULE_LICENSE and one for missing headers in the next iteration. Though I'd wait with that for now if you like to contact Ralph and Manfred, and do a v2 based on the outcome.

You can always just do the "add a SPDX line" patches now, that touch nothing else. No one can get upset at that.

thanks,

greg k-h

Mauro Carvalho Chehab

maintainer

2018-03-21 12:39 UTC #10 lore raw

In reply to Daniel Scheller

Em Tue, 20 Mar 2018 22:01:27 +0100
Daniel Scheller <[email protected]> escreveu:

Quoted 3 lines

Ralph, Manfred, I'm Cc'ing you on these five patches aswell, so if there are any concerns left regarding the changes proposed by these patches, please raise them.

It should be the reverse:

Ralph/Manfred,

When Daniel submits a version 2 of this patch series doing the changes requested by Greg, please reply with "Acked-by: your name <your@email>" in order to clearly state that you're OK with such changes.

Thanks,
Mauro