* [PATCH 0/2] occ: FSI and hwmon: Fix license headers
@ 2019-01-21 19:56 Eddie James
2019-01-21 19:56 ` [PATCH 1/2] hwmon (occ): " Eddie James
2019-01-21 19:56 ` [PATCH 2/2] fsi: occ: Fix license header Eddie James
0 siblings, 2 replies; 6+ messages in thread
From: Eddie James @ 2019-01-21 19:56 UTC (permalink / raw)
To: linux-hwmon; +Cc: linux-kernel, jdelvare, linux, joel, tglx, Eddie James
Source files for the FSI OCC and OCC hwmon drivers had a combination of bad
license information and missing IBM copyright. Correct the licenses.
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(-)
--
1.8.3.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] hwmon (occ): Fix license headers
2019-01-21 19:56 [PATCH 0/2] occ: FSI and hwmon: Fix license headers Eddie James
@ 2019-01-21 19:56 ` Eddie James
2019-01-21 20:19 ` Joel Stanley
2019-01-21 19:56 ` [PATCH 2/2] fsi: occ: Fix license header Eddie James
1 sibling, 1 reply; 6+ messages in thread
From: Eddie James @ 2019-01-21 19:56 UTC (permalink / raw)
To: linux-hwmon; +Cc: linux-kernel, jdelvare, linux, joel, tglx, Eddie James
Files have inconsistent license information.
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
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(-)
diff --git a/drivers/hwmon/occ/common.c b/drivers/hwmon/occ/common.c
index 391118c..b91a80a 100644
--- a/drivers/hwmon/occ/common.c
+++ b/drivers/hwmon/occ/common.c
@@ -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>
diff --git a/drivers/hwmon/occ/common.h b/drivers/hwmon/occ/common.h
index 7c44df3..55d4967 100644
--- a/drivers/hwmon/occ/common.h
+++ b/drivers/hwmon/occ/common.h
@@ -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
diff --git a/drivers/hwmon/occ/p8_i2c.c b/drivers/hwmon/occ/p8_i2c.c
index b59efc9..76fb787 100644
--- a/drivers/hwmon/occ/p8_i2c.c
+++ b/drivers/hwmon/occ/p8_i2c.c
@@ -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>
diff --git a/drivers/hwmon/occ/p9_sbe.c b/drivers/hwmon/occ/p9_sbe.c
index b65c1d1..f6387cc 100644
--- a/drivers/hwmon/occ/p9_sbe.c
+++ b/drivers/hwmon/occ/p9_sbe.c
@@ -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>
diff --git a/drivers/hwmon/occ/sysfs.c b/drivers/hwmon/occ/sysfs.c
index 743b26ec..fe3d15e 100644
--- a/drivers/hwmon/occ/sysfs.c
+++ b/drivers/hwmon/occ/sysfs.c
@@ -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>
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] hwmon (occ): Fix license headers
2019-01-21 19:56 ` [PATCH 1/2] hwmon (occ): " Eddie James
@ 2019-01-21 20:19 ` Joel Stanley
2019-01-21 21:15 ` Eddie James
0 siblings, 1 reply; 6+ messages in thread
From: Joel Stanley @ 2019-01-21 20:19 UTC (permalink / raw)
To: Eddie James
Cc: linux-hwmon, Linux Kernel Mailing List, Jean Delvare,
Guenter Roeck, Thomas Gleixner
On Tue, 22 Jan 2019 at 06:56, Eddie James <eajames@linux.ibm.com> wrote:
> --- a/drivers/hwmon/occ/common.h
> +++ b/drivers/hwmon/occ/common.h
> @@ -1,4 +1,5 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +// SPDX-License-Identifier: GPL-2.0+
> +// Copyright IBM Corp 2019
We want to use the /* */ syntax for headers. Take a closer look at
Documentation/process/license-rules.rst:
2. Style:
The SPDX license identifier is added in form of a comment. The comment
style depends on the file type::
C source: // SPDX-License-Identifier: <SPDX License Expression>
C header: /* SPDX-License-Identifier: <SPDX License Expression> */
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] hwmon (occ): Fix license headers
2019-01-21 20:19 ` Joel Stanley
@ 2019-01-21 21:15 ` Eddie James
2019-01-22 0:40 ` Guenter Roeck
0 siblings, 1 reply; 6+ messages in thread
From: Eddie James @ 2019-01-21 21:15 UTC (permalink / raw)
To: Joel Stanley
Cc: linux-hwmon, Linux Kernel Mailing List, Jean Delvare,
Guenter Roeck, Thomas Gleixner
On 01/21/2019 02:19 PM, Joel Stanley wrote:
> On Tue, 22 Jan 2019 at 06:56, Eddie James <eajames@linux.ibm.com> wrote:
>
>> --- a/drivers/hwmon/occ/common.h
>> +++ b/drivers/hwmon/occ/common.h
>> @@ -1,4 +1,5 @@
>> -/* SPDX-License-Identifier: GPL-2.0 */
>> +// SPDX-License-Identifier: GPL-2.0+
>> +// Copyright IBM Corp 2019
> We want to use the /* */ syntax for headers. Take a closer look at
> Documentation/process/license-rules.rst:
Oops. Do I put the copyright in the copyright in the same comment block
then? Or use // for that?
>
> 2. Style:
>
> The SPDX license identifier is added in form of a comment. The comment
> style depends on the file type::
>
> C source: // SPDX-License-Identifier: <SPDX License Expression>
> C header: /* SPDX-License-Identifier: <SPDX License Expression> */
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] hwmon (occ): Fix license headers
2019-01-21 21:15 ` Eddie James
@ 2019-01-22 0:40 ` Guenter Roeck
0 siblings, 0 replies; 6+ messages in thread
From: Guenter Roeck @ 2019-01-22 0:40 UTC (permalink / raw)
To: Eddie James, Joel Stanley
Cc: linux-hwmon, Linux Kernel Mailing List, Jean Delvare, Thomas Gleixner
On 1/21/19 1:15 PM, Eddie James wrote:
>
>
> On 01/21/2019 02:19 PM, Joel Stanley wrote:
>> On Tue, 22 Jan 2019 at 06:56, Eddie James <eajames@linux.ibm.com> wrote:
>>
>>> --- a/drivers/hwmon/occ/common.h
>>> +++ b/drivers/hwmon/occ/common.h
>>> @@ -1,4 +1,5 @@
>>> -/* SPDX-License-Identifier: GPL-2.0 */
>>> +// SPDX-License-Identifier: GPL-2.0+
>>> +// Copyright IBM Corp 2019
>> We want to use the /* */ syntax for headers. Take a closer look at
>> Documentation/process/license-rules.rst:
>
> Oops. Do I put the copyright in the copyright in the same comment block then? Or use // for that?
Separate comment block. The SPDX comment block is expected to be on its own.
But please don't make it even more messy than it already is by using //
subsequently for the IBM copyright.
Guenter
>
>>
>> 2. Style:
>>
>> The SPDX license identifier is added in form of a comment. The comment
>> style depends on the file type::
>>
>> C source: // SPDX-License-Identifier: <SPDX License Expression>
>> C header: /* SPDX-License-Identifier: <SPDX License Expression> */
>>
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] fsi: occ: Fix license header
2019-01-21 19:56 [PATCH 0/2] occ: FSI and hwmon: Fix license headers Eddie James
2019-01-21 19:56 ` [PATCH 1/2] hwmon (occ): " Eddie James
@ 2019-01-21 19:56 ` Eddie James
1 sibling, 0 replies; 6+ messages in thread
From: Eddie James @ 2019-01-21 19:56 UTC (permalink / raw)
To: linux-hwmon; +Cc: linux-kernel, jdelvare, linux, joel, tglx, Eddie James
OCC driver source is missing the IBM Copyright
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
drivers/fsi/fsi-occ.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/fsi/fsi-occ.c b/drivers/fsi/fsi-occ.c
index a2301ce..d75038f 100644
--- a/drivers/fsi/fsi-occ.c
+++ b/drivers/fsi/fsi-occ.c
@@ -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>
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-01-22 0:40 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-21 19:56 [PATCH 0/2] occ: FSI and hwmon: Fix license headers Eddie James
2019-01-21 19:56 ` [PATCH 1/2] hwmon (occ): " Eddie James
2019-01-21 20:19 ` Joel Stanley
2019-01-21 21:15 ` Eddie James
2019-01-22 0:40 ` Guenter Roeck
2019-01-21 19:56 ` [PATCH 2/2] fsi: occ: Fix license header Eddie James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).