Skip to contentSkip to conversation

x86/PCI: Add missing SPDX license header.

PATCH In review Krzysztof Wilczynski 3 participants 5 messages Aug 19, 2019 – Sep 30, 2019

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/PCI: Add missing SPDX license header.

Add the missing "SPDX-License-Identifier" license header to the arch/x86/pci/numachip.c. Use GPL-2.0 identifier derived using the comment mentioning license from the top of the file.

---
 arch/x86/pci/numachip.c | 1 +
 1 file changed, 1 insertion(+)
arch/x86/pci/numachip.c +1 -0
index 2e565e65c893..b73157e834e0 100644
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
Signature · 1 line
2.22.0
#1 lore raw
Quoted 14 lines · Krzysztof Wilczynski

Add the missing "SPDX-License-Identifier" license header to the arch/x86/pci/numachip.c. Use GPL-2.0 identifier derived using the comment mentioning license from the top of the file.

---
 arch/x86/pci/numachip.c | 1 +
 1 file changed, 1 insertion(+)
arch/x86/pci/numachip.c +0 -0
index 2e565e65c893..b73157e834e0 100644

arch/x86/pci/numachip.c line 4

Quoted 4 lines
arch/x86/pci/numachip.c +1 -0
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive

You can remove this license text at the same time as in 8cfab3cf63cf ("PCI: Add SPDX GPL-2.0 to replace GPL v2 boilerplate").

#2 lore raw

Hello Bjorn,

Thank you for the feedback.

[...]

Quoted 9 lines
Quoted 6 lines

+// SPDX-License-Identifier: GPL-2.0
/*
* This file is subject to the terms and conditions of the GNU
General Public
* License. See the file "COPYING" in the main directory of this
archive

You can remove this license text at the same time as in 8cfab3cf63cf ("PCI: Add SPDX GPL-2.0 to replace GPL v2 boilerplate").

Will do. I am going to send an updated v2 that takes care about this.

Krzysztof

#3 lore raw

PATCH v2 1/1 x86/PCI: Correct warnings about missing or incorrect SPDX license headers.

In reply to Krzysztof Wilczynski

Add the missing "SPDX-License-Identifier" license header to the arch/x86/pci/numachip.c (use the GPL-2.0 identifier derived using the comment mentioning license from the top of the file), and remove license boilerplate as per a similar commit 8cfab3cf63cf ("PCI: Add SPDX GPL-2.0 to replace GPL v2 boilerplate").

Correct existing SPDX license header in the files drivers/pci/controller/pcie-cadence.h and drivers/pci/controller/pcie-rockchip.h to use correct comment style as per the section 2 "Style" of the "Linux kernel licensing rules" (see:
Documentation/process/license-rules.rst).

Both changes will resolve the following checkpatch.pl script warning:

WARNING: Missing or malformed SPDX-License-Identifier tag in line 1

---
Changes in v2:
Update wording and mention checkpatch.pl script warnings. Add two C header files to which the fix also applies.

 arch/x86/pci/numachip.c                | 5 +----
 drivers/pci/controller/pcie-cadence.h  | 2 +-
 drivers/pci/controller/pcie-rockchip.h | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)
arch/x86/pci/numachip.c +1 -4
index 2e565e65c893..01a085d9135a 100644
@@ -1,8 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
  * Numascale NumaConnect-specific PCI code
  *
  * Copyright (C) 2012 Numascale AS. All rights reserved.
drivers/pci/controller/pcie-cadence.h +1 -1
index ae6bf2a2b3d3..f1cba3931b99 100644
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
 // Copyright (c) 2017 Cadence
 // Cadence PCIe controller driver.
 // Author: Cyrille Pitchen <[email protected]>
drivers/pci/controller/pcie-rockchip.h +1 -1
index 8e87a059ce73..53e4f9e59624 100644
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Rockchip AXI PCIe controller driver
  *
Signature · 1 line
2.22.1
#4 lore raw

Re: [PATCH v2] x86/PCI: Correct warnings about missing or incorrect SPDX license headers.

Quoted 14 lines · Krzysztof Wilczynski

Add the missing "SPDX-License-Identifier" license header to the arch/x86/pci/numachip.c (use the GPL-2.0 identifier derived using the comment mentioning license from the top of the file), and remove license boilerplate as per a similar commit 8cfab3cf63cf ("PCI: Add SPDX GPL-2.0 to replace GPL v2 boilerplate").

Correct existing SPDX license header in the files drivers/pci/controller/pcie-cadence.h and drivers/pci/controller/pcie-rockchip.h to use correct comment style as per the section 2 "Style" of the "Linux kernel licensing rules" (see:
Documentation/process/license-rules.rst).

Quoted 6 lines

Both changes will resolve the following checkpatch.pl script warning:

WARNING: Missing or malformed SPDX-License-Identifier tag in line 1

Applied to pci/misc for v5.5, thanks!

Quoted 47 lines

---
Changes in v2:
Update wording and mention checkpatch.pl script warnings. Add two C header files to which the fix also applies.

 arch/x86/pci/numachip.c                | 5 +----
 drivers/pci/controller/pcie-cadence.h  | 2 +-
 drivers/pci/controller/pcie-rockchip.h | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)
arch/x86/pci/numachip.c +1 -4
index 2e565e65c893..01a085d9135a 100644
@@ -1,8 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
  * Numascale NumaConnect-specific PCI code
  *
  * Copyright (C) 2012 Numascale AS. All rights reserved.
drivers/pci/controller/pcie-cadence.h +1 -1
index ae6bf2a2b3d3..f1cba3931b99 100644
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: GPL-2.0 */
 // Copyright (c) 2017 Cadence
 // Cadence PCIe controller driver.
 // Author: Cyrille Pitchen <[email protected]>
drivers/pci/controller/pcie-rockchip.h +1 -1
index 8e87a059ce73..53e4f9e59624 100644
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Rockchip AXI PCIe controller driver
  *
Signature · 1 line
2.22.1