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

[Guenter Roeck]

On Mon, Jan 28, 2019 at 10:23:23AM -0600, Eddie James wrote:
> Files have inconsistent license information.
> 
> Signed-off-by: Eddie James <eajames@xxxxxxxxxxxxx>

Applied.

Thanks,
Guenter

> ---
>  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..ed2cf42 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>