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]>
Signed-off-by: Greg Kroah-Hartman <[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(+)
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
index e0a04bfc873e..8034473c54ca 100644
--- a/drivers/tty/Kconfig
+++ b/drivers/tty/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
config TTY
bool "Enable TTY" if EXPERT
default y
diff --git a/drivers/tty/hvc/Kconfig b/drivers/tty/hvc/Kconfig
index 4293c172e120..1a910ec9f643 100644
--- a/drivers/tty/hvc/Kconfig
+++ b/drivers/tty/hvc/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
if TTY
config HVC_DRIVER
diff --git a/drivers/tty/ipwireless/Makefile b/drivers/tty/ipwireless/Makefile
index fe2e1730986b..a665d021e24d 100644
--- a/drivers/tty/ipwireless/Makefile
+++ b/drivers/tty/ipwireless/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
#
# Makefile for the IPWireless driver
#
diff --git a/drivers/tty/serdev/Kconfig b/drivers/tty/serdev/Kconfig
index 1dbc8352e027..46ae732bfc68 100644
--- a/drivers/tty/serdev/Kconfig
+++ b/drivers/tty/serdev/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
#
# Serial bus device driver configuration
#
diff --git a/drivers/tty/serdev/Makefile b/drivers/tty/serdev/Makefile
index 0cbdb9444d9d..078417e5b068 100644
--- a/drivers/tty/serdev/Makefile
+++ b/drivers/tty/serdev/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
serdev-objs := core.o
obj-$(CONFIG_SERIAL_DEV_BUS) += serdev.o
diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig
index 15c2c5463835..296115f6a4d8 100644
--- a/drivers/tty/serial/8250/Kconfig
+++ b/drivers/tty/serial/8250/Kconfig
@@ -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.
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 72966bc0ac76..a5032e58c737 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
#
# Serial device configuration
#
diff --git a/drivers/tty/serial/cpm_uart/Makefile b/drivers/tty/serial/cpm_uart/Makefile
index 896a5d57881c..3f3a6ed02ed4 100644
--- a/drivers/tty/serial/cpm_uart/Makefile
+++ b/drivers/tty/serial/cpm_uart/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
#
# Makefile for the Motorola 8xx FEC ethernet controller
#
diff --git a/drivers/tty/serial/jsm/Makefile b/drivers/tty/serial/jsm/Makefile
index 705d1ff6fdeb..4f2dbada7741 100644
--- a/drivers/tty/serial/jsm/Makefile
+++ b/drivers/tty/serial/jsm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
#
# Makefile for Jasmine adapter
#
--
2.21.0
On Tue, Apr 02, 2019 at 04:07:07PM +0200, Greg Kroah-Hartman wrote:
> 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]>
> Signed-off-by: Greg Kroah-Hartman <[email protected]>
> ---
For
> drivers/tty/ipwireless/Makefile | 1 +
Acked-by: David Sterba <[email protected]>
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]>
Signed-off-by: Greg Kroah-Hartman <[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(+)
diff --git a/drivers/tty/serial/8250/8250_men_mcb.c b/drivers/tty/serial/8250/8250_men_mcb.c
index 127017cc41d9..02c5aff58a74 100644
--- a/drivers/tty/serial/8250/8250_men_mcb.c
+++ b/drivers/tty/serial/8250/8250_men_mcb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
#include <linux/device.h>
#include <linux/kernel.h>
#include <linux/module.h>
diff --git a/drivers/tty/serial/sn_console.c b/drivers/tty/serial/sn_console.c
index fe9170731c16..283493358a62 100644
--- a/drivers/tty/serial/sn_console.c
+++ b/drivers/tty/serial/sn_console.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* C-Brick Serial Port (and console) driver for SGI Altix machines.
*
diff --git a/drivers/tty/vcc.c b/drivers/tty/vcc.c
index 58b454c34560..d2a1e1228c82 100644
--- a/drivers/tty/vcc.c
+++ b/drivers/tty/vcc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* vcc.c: sun4v virtual channel concentrator
*
* Copyright (C) 2017 Oracle. All rights reserved.
diff --git a/drivers/tty/vt/.gitignore b/drivers/tty/vt/.gitignore
index 83683a2d8e6a..9b38b85f9d9a 100644
--- a/drivers/tty/vt/.gitignore
+++ b/drivers/tty/vt/.gitignore
@@ -1,2 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0
consolemap_deftbl.c
defkeymap.c
diff --git a/drivers/tty/vt/cp437.uni b/drivers/tty/vt/cp437.uni
index bc6163484f62..a1991904c559 100644
--- a/drivers/tty/vt/cp437.uni
+++ b/drivers/tty/vt/cp437.uni
@@ -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
diff --git a/drivers/tty/vt/defkeymap.c_shipped b/drivers/tty/vt/defkeymap.c_shipped
index d2208dfe3f67..c7095fb7d2d1 100644
--- a/drivers/tty/vt/defkeymap.c_shipped
+++ b/drivers/tty/vt/defkeymap.c_shipped
@@ -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 */
diff --git a/drivers/tty/vt/defkeymap.map b/drivers/tty/vt/defkeymap.map
index 50b30cace261..37f1ac6ddfb9 100644
--- a/drivers/tty/vt/defkeymap.map
+++ b/drivers/tty/vt/defkeymap.map
@@ -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
--
2.21.0
On 4/2/2019 7:37 PM, Greg Kroah-Hartman wrote:
> 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]>
> Signed-off-by: Greg Kroah-Hartman <[email protected]>
Reviewed-by: Mukesh Ojha <[email protected]>
Cheers,
-Mukesh
> ---
> 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(+)
>
> diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
> index e0a04bfc873e..8034473c54ca 100644
> --- a/drivers/tty/Kconfig
> +++ b/drivers/tty/Kconfig
> @@ -1,3 +1,4 @@
> +# SPDX-License-Identifier: GPL-2.0
> config TTY
> bool "Enable TTY" if EXPERT
> default y
> diff --git a/drivers/tty/hvc/Kconfig b/drivers/tty/hvc/Kconfig
> index 4293c172e120..1a910ec9f643 100644
> --- a/drivers/tty/hvc/Kconfig
> +++ b/drivers/tty/hvc/Kconfig
> @@ -1,3 +1,4 @@
> +# SPDX-License-Identifier: GPL-2.0
> if TTY
>
> config HVC_DRIVER
> diff --git a/drivers/tty/ipwireless/Makefile b/drivers/tty/ipwireless/Makefile
> index fe2e1730986b..a665d021e24d 100644
> --- a/drivers/tty/ipwireless/Makefile
> +++ b/drivers/tty/ipwireless/Makefile
> @@ -1,3 +1,4 @@
> +# SPDX-License-Identifier: GPL-2.0
> #
> # Makefile for the IPWireless driver
> #
> diff --git a/drivers/tty/serdev/Kconfig b/drivers/tty/serdev/Kconfig
> index 1dbc8352e027..46ae732bfc68 100644
> --- a/drivers/tty/serdev/Kconfig
> +++ b/drivers/tty/serdev/Kconfig
> @@ -1,3 +1,4 @@
> +# SPDX-License-Identifier: GPL-2.0
> #
> # Serial bus device driver configuration
> #
> diff --git a/drivers/tty/serdev/Makefile b/drivers/tty/serdev/Makefile
> index 0cbdb9444d9d..078417e5b068 100644
> --- a/drivers/tty/serdev/Makefile
> +++ b/drivers/tty/serdev/Makefile
> @@ -1,3 +1,4 @@
> +# SPDX-License-Identifier: GPL-2.0
> serdev-objs := core.o
>
> obj-$(CONFIG_SERIAL_DEV_BUS) += serdev.o
> diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig
> index 15c2c5463835..296115f6a4d8 100644
> --- a/drivers/tty/serial/8250/Kconfig
> +++ b/drivers/tty/serial/8250/Kconfig
> @@ -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.
> diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
> index 72966bc0ac76..a5032e58c737 100644
> --- a/drivers/tty/serial/Kconfig
> +++ b/drivers/tty/serial/Kconfig
> @@ -1,3 +1,4 @@
> +# SPDX-License-Identifier: GPL-2.0
> #
> # Serial device configuration
> #
> diff --git a/drivers/tty/serial/cpm_uart/Makefile b/drivers/tty/serial/cpm_uart/Makefile
> index 896a5d57881c..3f3a6ed02ed4 100644
> --- a/drivers/tty/serial/cpm_uart/Makefile
> +++ b/drivers/tty/serial/cpm_uart/Makefile
> @@ -1,3 +1,4 @@
> +# SPDX-License-Identifier: GPL-2.0
> #
> # Makefile for the Motorola 8xx FEC ethernet controller
> #
> diff --git a/drivers/tty/serial/jsm/Makefile b/drivers/tty/serial/jsm/Makefile
> index 705d1ff6fdeb..4f2dbada7741 100644
> --- a/drivers/tty/serial/jsm/Makefile
> +++ b/drivers/tty/serial/jsm/Makefile
> @@ -1,3 +1,4 @@
> +# SPDX-License-Identifier: GPL-2.0
> #
> # Makefile for Jasmine adapter
> #
On 4/2/2019 7:37 PM, Greg Kroah-Hartman wrote:
> 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]>
> Signed-off-by: Greg Kroah-Hartman <[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(+)
>
> diff --git a/drivers/tty/serial/8250/8250_men_mcb.c b/drivers/tty/serial/8250/8250_men_mcb.c
> index 127017cc41d9..02c5aff58a74 100644
> --- a/drivers/tty/serial/8250/8250_men_mcb.c
> +++ b/drivers/tty/serial/8250/8250_men_mcb.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> #include <linux/device.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> diff --git a/drivers/tty/serial/sn_console.c b/drivers/tty/serial/sn_console.c
> index fe9170731c16..283493358a62 100644
> --- a/drivers/tty/serial/sn_console.c
> +++ b/drivers/tty/serial/sn_console.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * C-Brick Serial Port (and console) driver for SGI Altix machines.
> *
> diff --git a/drivers/tty/vcc.c b/drivers/tty/vcc.c
> index 58b454c34560..d2a1e1228c82 100644
> --- a/drivers/tty/vcc.c
> +++ b/drivers/tty/vcc.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> /* vcc.c: sun4v virtual channel concentrator
> *
> * Copyright (C) 2017 Oracle. All rights reserved.
> diff --git a/drivers/tty/vt/.gitignore b/drivers/tty/vt/.gitignore
> index 83683a2d8e6a..9b38b85f9d9a 100644
> --- a/drivers/tty/vt/.gitignore
> +++ b/drivers/tty/vt/.gitignore
.gitignore ?
Reviewed-by: Mukesh Ojha <[email protected]>
Cheers,
-Mukesh
> @@ -1,2 +1,3 @@
> +# SPDX-License-Identifier: GPL-2.0
> consolemap_deftbl.c
> defkeymap.c
> diff --git a/drivers/tty/vt/cp437.uni b/drivers/tty/vt/cp437.uni
> index bc6163484f62..a1991904c559 100644
> --- a/drivers/tty/vt/cp437.uni
> +++ b/drivers/tty/vt/cp437.uni
> @@ -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
> diff --git a/drivers/tty/vt/defkeymap.c_shipped b/drivers/tty/vt/defkeymap.c_shipped
> index d2208dfe3f67..c7095fb7d2d1 100644
> --- a/drivers/tty/vt/defkeymap.c_shipped
> +++ b/drivers/tty/vt/defkeymap.c_shipped
> @@ -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 */
>
> diff --git a/drivers/tty/vt/defkeymap.map b/drivers/tty/vt/defkeymap.map
> index 50b30cace261..37f1ac6ddfb9 100644
> --- a/drivers/tty/vt/defkeymap.map
> +++ b/drivers/tty/vt/defkeymap.map
> @@ -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
On Thu, Apr 04, 2019 at 02:16:06PM +0530, Mukesh Ojha wrote:
>
> On 4/2/2019 7:37 PM, Greg Kroah-Hartman wrote:
> > 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]>
> > Signed-off-by: Greg Kroah-Hartman <[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(+)
> >
> > diff --git a/drivers/tty/serial/8250/8250_men_mcb.c b/drivers/tty/serial/8250/8250_men_mcb.c
> > index 127017cc41d9..02c5aff58a74 100644
> > --- a/drivers/tty/serial/8250/8250_men_mcb.c
> > +++ b/drivers/tty/serial/8250/8250_men_mcb.c
> > @@ -1,3 +1,4 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > #include <linux/device.h>
> > #include <linux/kernel.h>
> > #include <linux/module.h>
> > diff --git a/drivers/tty/serial/sn_console.c b/drivers/tty/serial/sn_console.c
> > index fe9170731c16..283493358a62 100644
> > --- a/drivers/tty/serial/sn_console.c
> > +++ b/drivers/tty/serial/sn_console.c
> > @@ -1,3 +1,4 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > /*
> > * C-Brick Serial Port (and console) driver for SGI Altix machines.
> > *
> > diff --git a/drivers/tty/vcc.c b/drivers/tty/vcc.c
> > index 58b454c34560..d2a1e1228c82 100644
> > --- a/drivers/tty/vcc.c
> > +++ b/drivers/tty/vcc.c
> > @@ -1,3 +1,4 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > /* vcc.c: sun4v virtual channel concentrator
> > *
> > * Copyright (C) 2017 Oracle. All rights reserved.
> > diff --git a/drivers/tty/vt/.gitignore b/drivers/tty/vt/.gitignore
> > index 83683a2d8e6a..9b38b85f9d9a 100644
> > --- a/drivers/tty/vt/.gitignore
> > +++ b/drivers/tty/vt/.gitignore
>
> .gitignore ?
Yes, all files need them :)
> Reviewed-by: Mukesh Ojha <[email protected]>
Thanks for the review.
greg k-h