Skip to contentSkip to conversation

tty: add SPDX identifiers to Kconfig and Makefiles

PATCH In review Greg Kroah-Hartman 3 participants 6 messages Apr 2, 2019 – Apr 4, 2019

Subsystems (5)
lore
Share & tools
lore

Greg Kroah-Hartman

author maintainer
#0 lore raw

PATCH 1/2 tty: add SPDX identifiers to Kconfig and Makefiles

There were a few Kconfig and Makefiles under drivers/tty/ that were missing a SPDX identifier. Fix that up so that automated tools can properly classify all kernel source files.

Cc Jiri Slaby <[email protected]>
Cc Jiri Kosina <[email protected]>
Cc David Sterba <[email protected]>
Cc Rob Herring <[email protected]>
---
 drivers/tty/Kconfig                  | 1 +
 drivers/tty/hvc/Kconfig              | 1 +
 drivers/tty/ipwireless/Makefile      | 1 +
 drivers/tty/serdev/Kconfig           | 1 +
 drivers/tty/serdev/Makefile          | 1 +
 drivers/tty/serial/8250/Kconfig      | 1 +
 drivers/tty/serial/Kconfig           | 1 +
 drivers/tty/serial/cpm_uart/Makefile | 1 +
 drivers/tty/serial/jsm/Makefile      | 1 +
 9 files changed, 9 insertions(+)
drivers/tty/Kconfig +1 -0
index e0a04bfc873e..8034473c54ca 100644
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config TTY
 	bool "Enable TTY" if EXPERT
 	default y
drivers/tty/hvc/Kconfig +1 -0
index 4293c172e120..1a910ec9f643 100644
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if TTY
 
 config HVC_DRIVER
drivers/tty/ipwireless/Makefile +1 -0
index fe2e1730986b..a665d021e24d 100644
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the IPWireless driver
 #
drivers/tty/serdev/Kconfig +1 -0
index 1dbc8352e027..46ae732bfc68 100644
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Serial bus device driver configuration
 #
drivers/tty/serdev/Makefile +1 -0
index 0cbdb9444d9d..078417e5b068 100644
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 serdev-objs := core.o
 
 obj-$(CONFIG_SERIAL_DEV_BUS) += serdev.o
drivers/tty/serial/8250/Kconfig +1 -0
index 15c2c5463835..296115f6a4d8 100644
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # The 8250/16550 serial drivers.  You shouldn't be in this list unless
 # you somehow have an implicit or explicit dependency on SERIAL_8250.
drivers/tty/serial/Kconfig +1 -0
index 72966bc0ac76..a5032e58c737 100644
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Serial device configuration
 #
drivers/tty/serial/cpm_uart/Makefile +1 -0
index 896a5d57881c..3f3a6ed02ed4 100644
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Motorola 8xx FEC ethernet controller
 #
drivers/tty/serial/jsm/Makefile +1 -0
index 705d1ff6fdeb..4f2dbada7741 100644
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Jasmine adapter
 #
Signature · 1 line
2.21.0
author maintainer
#1 lore raw

PATCH 2/2 tty: fix up a few remaining files without SPDX identifiers

There were a few straggling files under drivers/tty/ that did not have any SPDX identifier either because they entered the tree recently, or they somehow missed the mass-tagging of commit b24413180f56 ("License
cleanup: add SPDX GPL-2.0 license identifier to files with no license")

This commit follows the same rule as b24413180f56 ("License cleanup: add SPDX GPL-2.0 license identifier to files with no license") where files without any specified license in them fall under GPL-2.0 as the correct license for the individual file. Add that identifier to these remaining files so that we don't have to guess at the license of them in the future.

Cc Jiri Slaby <[email protected]>
Cc "David S. Miller" <[email protected]>
---
 drivers/tty/serial/8250/8250_men_mcb.c | 1 +
 drivers/tty/serial/sn_console.c        | 1 +
 drivers/tty/vcc.c                      | 1 +
 drivers/tty/vt/.gitignore              | 1 +
 drivers/tty/vt/cp437.uni               | 1 +
 drivers/tty/vt/defkeymap.c_shipped     | 1 +
 drivers/tty/vt/defkeymap.map           | 1 +
 7 files changed, 7 insertions(+)
drivers/tty/serial/8250/8250_men_mcb.c +1 -0
index 127017cc41d9..02c5aff58a74 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
drivers/tty/serial/sn_console.c +1 -0
index fe9170731c16..283493358a62 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * C-Brick Serial Port (and console) driver for SGI Altix machines.
  *
drivers/tty/vcc.c +1 -0
index 58b454c34560..d2a1e1228c82 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* vcc.c: sun4v virtual channel concentrator
  *
  * Copyright (C) 2017 Oracle. All rights reserved.
drivers/tty/vt/.gitignore +1 -0
index 83683a2d8e6a..9b38b85f9d9a 100644
@@ -1,2 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0
 consolemap_deftbl.c
 defkeymap.c
drivers/tty/vt/cp437.uni +1 -0
index bc6163484f62..a1991904c559 100644
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Unicode table for IBM Codepage 437.  Note that there are many more
 # substitutions that could be conceived (for example, thick-line
drivers/tty/vt/defkeymap.c_shipped +1 -0
index d2208dfe3f67..c7095fb7d2d1 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Do not edit this file! It was automatically generated by   */
 /*    loadkeys --mktable defkeymap.map > defkeymap.c          */
 
drivers/tty/vt/defkeymap.map +1 -0
index 50b30cace261..37f1ac6ddfb9 100644
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Default kernel keymap. This uses 7 modifier combinations.
 keymaps 0-2,4-5,8,12
 # Change the above line into
Signature · 1 line
2.21.0
Acked-by on v1 1/2
#4 lore raw
In reply to Greg Kroah-Hartman
Quoted 10 lines · Greg Kroah-Hartman

There were a few Kconfig and Makefiles under drivers/tty/ that were missing a SPDX identifier. Fix that up so that automated tools can properly classify all kernel source files.

Cc Jiri Slaby <[email protected]>
Cc Jiri Kosina <[email protected]>
Cc David Sterba <[email protected]>
Cc Rob Herring <[email protected]>

---

For

Quoted 1 line
 drivers/tty/ipwireless/Makefile      | 1 +
Reviewed-by on v1 1/2
#5 lore raw
In reply to Greg Kroah-Hartman
Quoted 9 lines · Greg Kroah-Hartman

There were a few Kconfig and Makefiles under drivers/tty/ that were missing a SPDX identifier. Fix that up so that automated tools can properly classify all kernel source files.

Cc Jiri Slaby <[email protected]>
Cc Jiri Kosina <[email protected]>
Cc David Sterba <[email protected]>
Cc Rob Herring <[email protected]>

Cheers,
-Mukesh

Quoted 93 lines
---
  drivers/tty/Kconfig                  | 1 +
  drivers/tty/hvc/Kconfig              | 1 +
  drivers/tty/ipwireless/Makefile      | 1 +
  drivers/tty/serdev/Kconfig           | 1 +
  drivers/tty/serdev/Makefile          | 1 +
  drivers/tty/serial/8250/Kconfig      | 1 +
  drivers/tty/serial/Kconfig           | 1 +
  drivers/tty/serial/cpm_uart/Makefile | 1 +
  drivers/tty/serial/jsm/Makefile      | 1 +
  9 files changed, 9 insertions(+)
drivers/tty/Kconfig +1 -0
index e0a04bfc873e..8034473c54ca 100644
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
  config TTY
  	bool "Enable TTY" if EXPERT
  	default y
drivers/tty/hvc/Kconfig +1 -0
index 4293c172e120..1a910ec9f643 100644
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
  if TTY
 
  config HVC_DRIVER
drivers/tty/ipwireless/Makefile +1 -0
index fe2e1730986b..a665d021e24d 100644
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
  #
  # Makefile for the IPWireless driver
  #
drivers/tty/serdev/Kconfig +1 -0
index 1dbc8352e027..46ae732bfc68 100644
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
  #
  # Serial bus device driver configuration
  #
drivers/tty/serdev/Makefile +1 -0
index 0cbdb9444d9d..078417e5b068 100644
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
  serdev-objs := core.o
 
  obj-$(CONFIG_SERIAL_DEV_BUS) += serdev.o
drivers/tty/serial/8250/Kconfig +1 -0
index 15c2c5463835..296115f6a4d8 100644
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
  #
  # The 8250/16550 serial drivers.  You shouldn't be in this list unless
  # you somehow have an implicit or explicit dependency on SERIAL_8250.
drivers/tty/serial/Kconfig +1 -0
index 72966bc0ac76..a5032e58c737 100644
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
  #
  # Serial device configuration
  #
drivers/tty/serial/cpm_uart/Makefile +1 -0
index 896a5d57881c..3f3a6ed02ed4 100644
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
  #
  # Makefile for the Motorola 8xx FEC ethernet controller
  #
drivers/tty/serial/jsm/Makefile +1 -0
index 705d1ff6fdeb..4f2dbada7741 100644
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
  #
  # Makefile for Jasmine adapter
  #
Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] tty: fix up a few remaining files without SPDX identifiers

In reply to Greg Kroah-Hartman

drivers/tty/vt/.gitignore

Quoted 56 lines · Greg Kroah-Hartman

There were a few straggling files under drivers/tty/ that did not have any SPDX identifier either because they entered the tree recently, or they somehow missed the mass-tagging of commit b24413180f56 ("License
cleanup: add SPDX GPL-2.0 license identifier to files with no license")

This commit follows the same rule as b24413180f56 ("License cleanup: add SPDX GPL-2.0 license identifier to files with no license") where files without any specified license in them fall under GPL-2.0 as the correct license for the individual file. Add that identifier to these remaining files so that we don't have to guess at the license of them in the future.

Cc Jiri Slaby <[email protected]>
Cc "David S. Miller" <[email protected]>
---
  drivers/tty/serial/8250/8250_men_mcb.c | 1 +
  drivers/tty/serial/sn_console.c        | 1 +
  drivers/tty/vcc.c                      | 1 +
  drivers/tty/vt/.gitignore              | 1 +
  drivers/tty/vt/cp437.uni               | 1 +
  drivers/tty/vt/defkeymap.c_shipped     | 1 +
  drivers/tty/vt/defkeymap.map           | 1 +
  7 files changed, 7 insertions(+)
drivers/tty/serial/8250/8250_men_mcb.c +1 -0
index 127017cc41d9..02c5aff58a74 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
  #include <linux/device.h>
  #include <linux/kernel.h>
  #include <linux/module.h>
drivers/tty/serial/sn_console.c +1 -0
index fe9170731c16..283493358a62 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
  /*
   * C-Brick Serial Port (and console) driver for SGI Altix machines.
   *
drivers/tty/vcc.c +1 -0
index 58b454c34560..d2a1e1228c82 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
  /* vcc.c: sun4v virtual channel concentrator
   *
   * Copyright (C) 2017 Oracle. All rights reserved.
drivers/tty/vt/.gitignore +0 -0
index 83683a2d8e6a..9b38b85f9d9a 100644

.gitignore ?

Cheers,
-Mukesh

Quoted 31 lines
drivers/tty/vt/.gitignore +1 -0
@@ -1,2 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0
  consolemap_deftbl.c
  defkeymap.c
drivers/tty/vt/cp437.uni +1 -0
index bc6163484f62..a1991904c559 100644
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
  #
  # Unicode table for IBM Codepage 437.  Note that there are many more
  # substitutions that could be conceived (for example, thick-line
drivers/tty/vt/defkeymap.c_shipped +1 -0
index d2208dfe3f67..c7095fb7d2d1 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
  /* Do not edit this file! It was automatically generated by   */
  /*    loadkeys --mktable defkeymap.map > defkeymap.c          */
 
drivers/tty/vt/defkeymap.map +1 -0
index 50b30cace261..37f1ac6ddfb9 100644
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
  # Default kernel keymap. This uses 7 modifier combinations.
  keymaps 0-2,4-5,8,12
  # Change the above line into
author maintainer
#3 lore raw

Re: [PATCH 2/2] tty: fix up a few remaining files without SPDX identifiers

Quoted 52 lines · Mukesh Ojha
Quoted 50 lines · Greg Kroah-Hartman

There were a few straggling files under drivers/tty/ that did not have any SPDX identifier either because they entered the tree recently, or they somehow missed the mass-tagging of commit b24413180f56 ("License
cleanup: add SPDX GPL-2.0 license identifier to files with no license")

This commit follows the same rule as b24413180f56 ("License cleanup: add SPDX GPL-2.0 license identifier to files with no license") where files without any specified license in them fall under GPL-2.0 as the correct license for the individual file. Add that identifier to these remaining files so that we don't have to guess at the license of them in the future.

Cc Jiri Slaby <[email protected]>
Cc "David S. Miller" <[email protected]>
---
  drivers/tty/serial/8250/8250_men_mcb.c | 1 +
  drivers/tty/serial/sn_console.c        | 1 +
  drivers/tty/vcc.c                      | 1 +
  drivers/tty/vt/.gitignore              | 1 +
  drivers/tty/vt/cp437.uni               | 1 +
  drivers/tty/vt/defkeymap.c_shipped     | 1 +
  drivers/tty/vt/defkeymap.map           | 1 +
  7 files changed, 7 insertions(+)
drivers/tty/serial/8250/8250_men_mcb.c +1 -0
index 127017cc41d9..02c5aff58a74 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
  #include <linux/device.h>
  #include <linux/kernel.h>
  #include <linux/module.h>
drivers/tty/serial/sn_console.c +1 -0
index fe9170731c16..283493358a62 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
  /*
   * C-Brick Serial Port (and console) driver for SGI Altix machines.
   *
drivers/tty/vcc.c +1 -0
index 58b454c34560..d2a1e1228c82 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
  /* vcc.c: sun4v virtual channel concentrator
Quoted 8 lines

drivers/tty/vt/.gitignore

Quoted 6 lines
drivers/tty/vcc.c +0 -0
   *
   * Copyright (C) 2017 Oracle. All rights reserved.
drivers/tty/vt/.gitignore +0 -0
index 83683a2d8e6a..9b38b85f9d9a 100644

.gitignore ?

Yes, all files need them :)

Quoted 1 line

Thanks for the review.

greg k-h