# \[PATCH 0/7\] check Makefile and Kconfigs for SPDX tag - Subsystems: CHAR and MISC DRIVERS, CHECKPATCH, IIO SUBSYSTEM AND DRIVERS, INTEL MANAGEMENT ENGINE (mei), LITEX PLATFORM, MEDIATEK MT76 WIRELESS LAN DRIVER, MIPS, THE REST - Maintainers: Arnd Bergmann, Greg Kroah-Hartman, Andy Whitcroft, Joe Perches, Jonathan Cameron, Alexander Usyskin, Karol Gugala, Mateusz Holenko, Joel Stanley, Felix Fietkau, Lorenzo Bianconi, Ryder Lee, Thomas Bogendoerfer, Linus Torvalds - Series: 7 patches touching 11 files, +10/-11 - Status: PENDING · 2 of 7 landed - Pending, 2 of 7 landed. - List: netdev - 13 messages, 6 authors - Page: https://ratatoskr.run/netdev/2021/06/1410516/t ## \[PATCH 0/7\] check Makefile and Kconfigs for SPDX tag - From: trix@redhat.com - Date: 2021-06-10 21:45:24 - Message: https://ratatoskr.run/netdev/2021/06/1410516.md ```text From: Tom Rix A followup to https://lore.kernel.org/linux-fpga/YMD2yxtsQN16MoPA@kroah.com/ So I do not repeat this problem, add a SPDX checker for Makefiles and Kconfigs to checkpatch. Then treewide fix the malformed Makefiles and Kconfigs. Those missing tags are numerous. Kconfig has 46 Makefile has 141 Run checkpatch generally over the dirs with Makefile or Kconfig problems to check nothing broke in checkpatch. Fix the few problems turned up Tom Rix (7): checkpatch: check Makefiles and Kconfigs for SPDX tag mei: hdcp: SPDX tag should be the first line drivers/soc/litex: fix spelling of SPDX tag MIPS: Loongson64: fix spelling of SPDX tag iio/scmi: fix spelling of SPDX tag mt76: add a space between comment char and SPDX tag mt76: use SPDX header file comment style arch/mips/boot/dts/loongson/Makefile | 2 +- drivers/iio/common/scmi_sensors/Makefile | 2 +- drivers/misc/mei/hdcp/Kconfig | 1 - drivers/net/wireless/mediatek/mt76/mt7615/Makefile | 2 +- drivers/net/wireless/mediatek/mt76/mt7615/sdio.h | 2 +- drivers/net/wireless/mediatek/mt76/mt7915/Makefile | 2 +- drivers/net/wireless/mediatek/mt76/mt7915/testmode.h | 2 +- drivers/net/wireless/mediatek/mt76/mt7921/Makefile | 2 +- drivers/soc/litex/Kconfig | 2 +- drivers/soc/litex/Makefile | 2 +- scripts/checkpatch.pl | 2 +- 11 files changed, 10 insertions(+), 11 deletions(-) -- 2.26.3 ``` ## \[PATCH 1/7\] checkpatch: check Makefiles and Kconfigs for SPDX tag - From: trix@redhat.com - Date: 2021-06-10 21:45:42 - Message: https://ratatoskr.run/netdev/2021/06/1410518.md ```text From: Tom Rix Both Makefiles and Kconfigs should carry an SPDX tag. Something like # SPDX-License-Identifier: GPL-2.0-only Add a matcher to existing check Signed-off-by: Tom Rix --- scripts/checkpatch.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index dad87c3686326..7fca3a7c38791 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -3572,7 +3572,7 @@ sub process { $comment = '/*'; } elsif ($realfile =~ /\.(c|dts|dtsi)$/) { $comment = '//'; - } elsif (($checklicenseline == 2) || $realfile =~ /\.(sh|pl|py|awk|tc|yaml)$/) { + } elsif (($checklicenseline == 2) || $realfile =~ /\.(sh|pl|py|awk|tc|yaml)$|Kconfig|Makefile/) { $comment = '#'; } elsif ($realfile =~ /\.rst$/) { $comment = '..'; -- 2.26.3 ``` ## \[PATCH 2/7\] mei: hdcp: SPDX tag should be the first line - From: trix@redhat.com - Date: 2021-06-10 21:45:45 - Message: https://ratatoskr.run/netdev/2021/06/1410519.md ```text From: Tom Rix checkpatch looks for the tag on the first line. So delete empty first line Signed-off-by: Tom Rix --- drivers/misc/mei/hdcp/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/misc/mei/hdcp/Kconfig b/drivers/misc/mei/hdcp/Kconfig index 95b2d6d37f102..54e1c95269096 100644 --- a/drivers/misc/mei/hdcp/Kconfig +++ b/drivers/misc/mei/hdcp/Kconfig @@ -1,4 +1,3 @@ - # SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2019, Intel Corporation. All rights reserved. # -- 2.26.3 ``` ## \[PATCH 3/7\] drivers/soc/litex: fix spelling of SPDX tag - From: trix@redhat.com - Date: 2021-06-10 21:45:59 - Message: https://ratatoskr.run/netdev/2021/06/1410521.md ```text From: Tom Rix checkpatch looks for SPDX-License-Identifier. So change the '_' to '-' Signed-off-by: Tom Rix --- drivers/soc/litex/Kconfig | 2 +- drivers/soc/litex/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/soc/litex/Kconfig b/drivers/soc/litex/Kconfig index e7011d665b151..c03b1f816cc08 100644 --- a/drivers/soc/litex/Kconfig +++ b/drivers/soc/litex/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License_Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0 menu "Enable LiteX SoC Builder specific drivers" diff --git a/drivers/soc/litex/Makefile b/drivers/soc/litex/Makefile index 98ff7325b1c07..aeae1f4165a70 100644 --- a/drivers/soc/litex/Makefile +++ b/drivers/soc/litex/Makefile @@ -1,3 +1,3 @@ -# SPDX-License_Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_LITEX_SOC_CONTROLLER) += litex_soc_ctrl.o -- 2.26.3 ``` ## \[PATCH 4/7\] MIPS: Loongson64: fix spelling of SPDX tag - From: trix@redhat.com - Date: 2021-06-10 21:46:09 - Message: https://ratatoskr.run/netdev/2021/06/1410522.md ```text From: Tom Rix checkpatch looks for SPDX-License-Identifier. So change the '_' to '-' Signed-off-by: Tom Rix --- arch/mips/boot/dts/loongson/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/boot/dts/loongson/Makefile b/arch/mips/boot/dts/loongson/Makefile index 72267bfda9b41..5c6433e441ee4 100644 --- a/arch/mips/boot/dts/loongson/Makefile +++ b/arch/mips/boot/dts/loongson/Makefile @@ -1,4 +1,4 @@ -# SPDX_License_Identifier: GPL_2.0 +# SPDX-License-Identifier: GPL-2.0 dtb-$(CONFIG_MACH_LOONGSON64) += loongson64_2core_2k1000.dtb dtb-$(CONFIG_MACH_LOONGSON64) += loongson64c_4core_ls7a.dtb dtb-$(CONFIG_MACH_LOONGSON64) += loongson64c_4core_rs780e.dtb -- 2.26.3 ``` ## \[PATCH 5/7\] iio/scmi: fix spelling of SPDX tag - From: trix@redhat.com - Date: 2021-06-10 21:46:27 - Message: https://ratatoskr.run/netdev/2021/06/1410523.md ```text From: Tom Rix checkpatch looks for SPDX-License-Identifier. Remove the extra spaces. Signed-off-by: Tom Rix --- drivers/iio/common/scmi_sensors/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iio/common/scmi_sensors/Makefile b/drivers/iio/common/scmi_sensors/Makefile index f13140a2575a4..645e0fce1a739 100644 --- a/drivers/iio/common/scmi_sensors/Makefile +++ b/drivers/iio/common/scmi_sensors/Makefile @@ -1,4 +1,4 @@ -# SPDX - License - Identifier : GPL - 2.0 - only +# SPDX-License-Identifier: GPL-2.0-only # # Makefile for the IIO over SCMI # -- 2.26.3 ``` ## \[PATCH 6/7\] mt76: add a space between comment char and SPDX tag - From: trix@redhat.com - Date: 2021-06-10 21:46:35 - Message: https://ratatoskr.run/netdev/2021/06/1410524.md ```text From: Tom Rix checkpatch expects a space between '#' and 'SPDX...' Add a space. Signed-off-by: Tom Rix --- drivers/net/wireless/mediatek/mt76/mt7615/Makefile | 2 +- drivers/net/wireless/mediatek/mt76/mt7915/Makefile | 2 +- drivers/net/wireless/mediatek/mt76/mt7921/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/Makefile b/drivers/net/wireless/mediatek/mt76/mt7615/Makefile index e8fc4a7ae9bc2..83f9861ff5226 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/Makefile +++ b/drivers/net/wireless/mediatek/mt76/mt7615/Makefile @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: ISC +# SPDX-License-Identifier: ISC obj-$(CONFIG_MT7615_COMMON) += mt7615-common.o obj-$(CONFIG_MT7615E) += mt7615e.o diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/Makefile b/drivers/net/wireless/mediatek/mt76/mt7915/Makefile index 40c8061787e94..80e49244348e2 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/Makefile +++ b/drivers/net/wireless/mediatek/mt76/mt7915/Makefile @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: ISC +# SPDX-License-Identifier: ISC obj-$(CONFIG_MT7915E) += mt7915e.o diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/Makefile b/drivers/net/wireless/mediatek/mt76/mt7921/Makefile index e531666f9fb43..0ebb59966a083 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/Makefile +++ b/drivers/net/wireless/mediatek/mt76/mt7921/Makefile @@ -1,4 +1,4 @@ -#SPDX-License-Identifier: ISC +# SPDX-License-Identifier: ISC obj-$(CONFIG_MT7921E) += mt7921e.o -- 2.26.3 ``` ## \[PATCH 7/7\] mt76: use SPDX header file comment style - From: trix@redhat.com - Date: 2021-06-10 21:46:42 - Message: https://ratatoskr.run/netdev/2021/06/1410525.md ```text From: Tom Rix header files should use '/* SPDX ... */ Change from c file comment syle to header style Signed-off-by: Tom Rix --- drivers/net/wireless/mediatek/mt76/mt7615/sdio.h | 2 +- drivers/net/wireless/mediatek/mt76/mt7915/testmode.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/sdio.h b/drivers/net/wireless/mediatek/mt76/mt7615/sdio.h index 05180971de841..03877d89e1520 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/sdio.h +++ b/drivers/net/wireless/mediatek/mt76/mt7615/sdio.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: ISC +/* SPDX-License-Identifier: ISC */ /* Copyright (C) 2020 MediaTek Inc. * * Author: Sean Wang diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/testmode.h b/drivers/net/wireless/mediatek/mt76/mt7915/testmode.h index 8f8533ef9859f..397a6b5532bcc 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/testmode.h +++ b/drivers/net/wireless/mediatek/mt76/mt7915/testmode.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: ISC +/* SPDX-License-Identifier: ISC */ /* Copyright (C) 2020 MediaTek Inc. */ #ifndef __MT7915_TESTMODE_H -- 2.26.3 ``` ## Re: \[PATCH 1/7\] checkpatch: check Makefiles and Kconfigs for SPDX tag - From: Joe Perches \ - Date: 2021-06-10 22:15:21 - Message: https://ratatoskr.run/netdev/2021/06/1410537.md ```text On Thu, 2021-06-10 at 14:44 -0700, trix@redhat.com wrote: > From: Tom Rix > > Both Makefiles and Kconfigs should carry an SPDX tag. > Something like >  # SPDX-License-Identifier: GPL-2.0-only > > Add a matcher to existing check > > Signed-off-by: Tom Rix Seems fine, thanks. There's a Makefile with two tags that could be updated too. --- drivers/staging/media/atomisp/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/media/atomisp/Makefile b/drivers/staging/media/atomisp/Makefile index 51498b2e85b8f..cee03e31f420d 100644 --- a/drivers/staging/media/atomisp/Makefile +++ b/drivers/staging/media/atomisp/Makefile @@ -11,7 +11,6 @@ DEFINES += -DDEBUG atomisp = $(srctree)/drivers/staging/media/atomisp/ -# SPDX-License-Identifier: GPL-2.0 atomisp-objs += \ pci/atomisp_acc.o \ pci/atomisp_cmd.o \ ``` ## RE: \[PATCH 2/7\] mei: hdcp: SPDX tag should be the first line - From: Winkler, Tomas \ - Date: 2021-06-11 16:12:35 - Message: https://ratatoskr.run/netdev/2021/06/1411465.md ```text > > From: Tom Rix > > checkpatch looks for the tag on the first line. > So delete empty first line > > Signed-off-by: Tom Rix Acked-by: Tomas Winkler > --- > drivers/misc/mei/hdcp/Kconfig | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/misc/mei/hdcp/Kconfig b/drivers/misc/mei/hdcp/Kconfig > index 95b2d6d37f102..54e1c95269096 100644 > --- a/drivers/misc/mei/hdcp/Kconfig > +++ b/drivers/misc/mei/hdcp/Kconfig > @@ -1,4 +1,3 @@ > - > # SPDX-License-Identifier: GPL-2.0 > # Copyright (c) 2019, Intel Corporation. All rights reserved. > # > -- > 2.26.3 ``` ## Re: \[PATCH 5/7\] iio/scmi: fix spelling of SPDX tag - From: Jonathan Cameron \ - Date: 2021-06-11 17:36:03 - Message: https://ratatoskr.run/netdev/2021/06/1411617.md ```text On Thu, 10 Jun 2021 14:44:36 -0700 trix@redhat.com wrote: > From: Tom Rix > > checkpatch looks for SPDX-License-Identifier. > Remove the extra spaces. > > Signed-off-by: Tom Rix Applied this one to the togreg branch of iio.git (initially pushed out as testing to let 0-day have first poke at it). Thanks, Jonathan > --- > drivers/iio/common/scmi_sensors/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/iio/common/scmi_sensors/Makefile b/drivers/iio/common/scmi_sensors/Makefile > index f13140a2575a4..645e0fce1a739 100644 > --- a/drivers/iio/common/scmi_sensors/Makefile > +++ b/drivers/iio/common/scmi_sensors/Makefile > @@ -1,4 +1,4 @@ > -# SPDX - License - Identifier : GPL - 2.0 - only > +# SPDX-License-Identifier: GPL-2.0-only > # > # Makefile for the IIO over SCMI > # ``` ## Re: \[PATCH 3/7\] drivers/soc/litex: fix spelling of SPDX tag - From: Stafford Horne \ - Date: 2021-06-11 20:38:58 - Message: https://ratatoskr.run/netdev/2021/06/1411788.md ```text On Thu, Jun 10, 2021 at 02:44:34PM -0700, trix@redhat.com wrote: > From: Tom Rix > > checkpatch looks for SPDX-License-Identifier. > So change the '_' to '-' > > Signed-off-by: Tom Rix Acked-by: Stafford Horne > --- > drivers/soc/litex/Kconfig | 2 +- > drivers/soc/litex/Makefile | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/soc/litex/Kconfig b/drivers/soc/litex/Kconfig > index e7011d665b151..c03b1f816cc08 100644 > --- a/drivers/soc/litex/Kconfig > +++ b/drivers/soc/litex/Kconfig > @@ -1,4 +1,4 @@ > -# SPDX-License_Identifier: GPL-2.0 > +# SPDX-License-Identifier: GPL-2.0 > > menu "Enable LiteX SoC Builder specific drivers" > > diff --git a/drivers/soc/litex/Makefile b/drivers/soc/litex/Makefile > index 98ff7325b1c07..aeae1f4165a70 100644 > --- a/drivers/soc/litex/Makefile > +++ b/drivers/soc/litex/Makefile > @@ -1,3 +1,3 @@ > -# SPDX-License_Identifier: GPL-2.0 > +# SPDX-License-Identifier: GPL-2.0 > > obj-$(CONFIG_LITEX_SOC_CONTROLLER) += litex_soc_ctrl.o > -- > 2.26.3 > ``` ## Re: \[PATCH 4/7\] MIPS: Loongson64: fix spelling of SPDX tag - From: Thomas Bogendoerfer \ - Date: 2021-06-21 09:54:40 - Message: https://ratatoskr.run/netdev/2021/06/1420572.md ```text On Thu, Jun 10, 2021 at 02:44:35PM -0700, trix@redhat.com wrote: > From: Tom Rix > > checkpatch looks for SPDX-License-Identifier. > So change the '_' to '-' > > Signed-off-by: Tom Rix > --- > arch/mips/boot/dts/loongson/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) applied to mips-next. Thomas. -- Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ] ```