Skip to contentSkip to conversation

occ: FSI and hwmon: Fix license headers

PATCH Applied Eddie James 3 participants 5 messages Jan 28, 2019 – Jan 31, 2019

Subsystems (2)
lore
Share & tools
lore

Eddie James

author maintainer
#0 lore raw

v2 cover occ: FSI and hwmon: Fix license headers

From: Eddie James <[email protected]>

Source files for the FSI OCC and OCC hwmon drivers had a combination of bad license information and missing IBM copyright. Correct the licenses.

Changes since v1:
- correct header comment style

Eddie James (2):
hwmon (occ): Fix license headers
fsi: occ: Fix license header

 drivers/fsi/fsi-occ.c      |  3 ++-
 drivers/hwmon/occ/common.c |  3 ++-
 drivers/hwmon/occ/common.h |  3 ++-
 drivers/hwmon/occ/p8_i2c.c |  3 ++-
 drivers/hwmon/occ/p9_sbe.c |  3 ++-
 drivers/hwmon/occ/sysfs.c  | 13 ++-----------
 6 files changed, 12 insertions(+), 16 deletions(-)
Signature · 1 line
1.8.3.1
author maintainer
#1 lore raw

PATCH v2 1/2 hwmon (occ): Fix license headers

Files have inconsistent license information.

---
 drivers/hwmon/occ/common.c |  3 ++-
 drivers/hwmon/occ/common.h |  3 ++-
 drivers/hwmon/occ/p8_i2c.c |  3 ++-
 drivers/hwmon/occ/p9_sbe.c |  3 ++-
 drivers/hwmon/occ/sysfs.c  | 13 ++-----------
 5 files changed, 10 insertions(+), 15 deletions(-)
drivers/hwmon/occ/common.c +2 -1
index 391118c..b91a80a 100644
@@ -1,4 +1,5 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0+
+// Copyright IBM Corp 2019
 
 #include <linux/device.h>
 #include <linux/hwmon.h>
drivers/hwmon/occ/common.h +2 -1
index 7c44df3..ed2cf42 100644
@@ -1,4 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0+ */
+/* Copyright IBM Corp 2019 */
 
 #ifndef OCC_COMMON_H
 #define OCC_COMMON_H
drivers/hwmon/occ/p8_i2c.c +2 -1
index b59efc9..76fb787 100644
@@ -1,4 +1,5 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0+
+// Copyright IBM Corp 2019
 
 #include <linux/device.h>
 #include <linux/errno.h>
drivers/hwmon/occ/p9_sbe.c +2 -1
index b65c1d1..f6387cc 100644
@@ -1,4 +1,5 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0+
+// Copyright IBM Corp 2019
 
 #include <linux/device.h>
 #include <linux/errno.h>
drivers/hwmon/occ/sysfs.c +2 -11
index 743b26ec..fe3d15e 100644
@@ -1,14 +1,5 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * OCC hwmon driver sysfs interface
- *
- * Copyright (C) IBM Corporation 2018
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
+// SPDX-License-Identifier: GPL-2.0+
+// Copyright IBM Corp 2019
 
 #include <linux/bitops.h>
 #include <linux/device.h>
Signature · 1 line
1.8.3.1
maintainer Applied
#2 lore raw

Re: [PATCH v2 1/2] hwmon (occ): Fix license headers

Quoted 3 lines · Eddie James

Files have inconsistent license information.

Applied.

Thanks,
Guenter

Quoted 73 lines
---
 drivers/hwmon/occ/common.c |  3 ++-
 drivers/hwmon/occ/common.h |  3 ++-
 drivers/hwmon/occ/p8_i2c.c |  3 ++-
 drivers/hwmon/occ/p9_sbe.c |  3 ++-
 drivers/hwmon/occ/sysfs.c  | 13 ++-----------
 5 files changed, 10 insertions(+), 15 deletions(-)
drivers/hwmon/occ/common.c +2 -1
index 391118c..b91a80a 100644
@@ -1,4 +1,5 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0+
+// Copyright IBM Corp 2019
 
 #include <linux/device.h>
 #include <linux/hwmon.h>
drivers/hwmon/occ/common.h +2 -1
index 7c44df3..ed2cf42 100644
@@ -1,4 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0+ */
+/* Copyright IBM Corp 2019 */
 
 #ifndef OCC_COMMON_H
 #define OCC_COMMON_H
drivers/hwmon/occ/p8_i2c.c +2 -1
index b59efc9..76fb787 100644
@@ -1,4 +1,5 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0+
+// Copyright IBM Corp 2019
 
 #include <linux/device.h>
 #include <linux/errno.h>
drivers/hwmon/occ/p9_sbe.c +2 -1
index b65c1d1..f6387cc 100644
@@ -1,4 +1,5 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0+
+// Copyright IBM Corp 2019
 
 #include <linux/device.h>
 #include <linux/errno.h>
drivers/hwmon/occ/sysfs.c +2 -11
index 743b26ec..fe3d15e 100644
@@ -1,14 +1,5 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * OCC hwmon driver sysfs interface
- *
- * Copyright (C) IBM Corporation 2018
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
+// SPDX-License-Identifier: GPL-2.0+
+// Copyright IBM Corp 2019
 
 #include <linux/bitops.h>
 #include <linux/device.h>
author maintainer
#3 lore raw

PATCH v2 2/2 fsi: occ: Fix license header

In reply to Eddie James

OCC driver source is missing the IBM Copyright

---
 drivers/fsi/fsi-occ.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/fsi/fsi-occ.c +2 -1
index a2301ce..d75038f 100644
@@ -1,4 +1,5 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0+
+// Copyright IBM Corp 2019
 
 #include <linux/device.h>
 #include <linux/err.h>
Signature · 1 line
1.8.3.1