2019-06-25 19:19:20

by Charles Keepax

Subject: [PATCH] irqchip: madera: Fixup SPDX headers

GPL-2.0-only is the preferred way of expressing v2 of the GPL, update
the code to use this.

Signed-off-by: Charles Keepax <[email protected]>
---
drivers/irqchip/irq-madera.c | 2 +-
include/linux/irqchip/irq-madera.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/irqchip/irq-madera.c b/drivers/irqchip/irq-madera.c
index 8b81271c823c6..6b0457876941d 100644
--- a/drivers/irqchip/irq-madera.c
+++ b/drivers/irqchip/irq-madera.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Interrupt support for Cirrus Logic Madera codecs
*
diff --git a/include/linux/irqchip/irq-madera.h b/include/linux/irqchip/irq-madera.h
index 1160fa3769ae6..3a46cadd38654 100644
--- a/include/linux/irqchip/irq-madera.h
+++ b/include/linux/irqchip/irq-madera.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Interrupt support for Cirrus Logic Madera codecs
*
--
2.11.0

2019-07-26 13:50:30

by Marc Zyngier

Subject: Re: [PATCH] irqchip: madera: Fixup SPDX headers

On Tue, 25 Jun 2019 16:47:17 +0100,
Charles Keepax <[email protected]> wrote:
>
> GPL-2.0-only is the preferred way of expressing v2 of the GPL, update
> the code to use this.
>
> Signed-off-by: Charles Keepax <[email protected]>
> ---
> drivers/irqchip/irq-madera.c | 2 +-
> include/linux/irqchip/irq-madera.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/irqchip/irq-madera.c b/drivers/irqchip/irq-madera.c
> index 8b81271c823c6..6b0457876941d 100644
> --- a/drivers/irqchip/irq-madera.c
> +++ b/drivers/irqchip/irq-madera.c
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Interrupt support for Cirrus Logic Madera codecs
> *
> diff --git a/include/linux/irqchip/irq-madera.h b/include/linux/irqchip/irq-madera.h
> index 1160fa3769ae6..3a46cadd38654 100644
> --- a/include/linux/irqchip/irq-madera.h
> +++ b/include/linux/irqchip/irq-madera.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * Interrupt support for Cirrus Logic Madera codecs
> *
> --
> 2.11.0
>

I'm not sure this changes anything. LICENSES/preferred/GPL-2.0 doesn't
seem to distinguish the two tags.

Thomas, what do you think?

M.

--
Jazz is not dead, it just smells funny.

2019-07-26 18:24:44

by Charles Keepax

Subject: Re: [PATCH] irqchip: madera: Fixup SPDX headers

On Fri, Jul 26, 2019 at 02:47:05PM +0100, Marc Zyngier wrote:
> On Tue, 25 Jun 2019 16:47:17 +0100,
> Charles Keepax <[email protected]> wrote:
> > diff --git a/include/linux/irqchip/irq-madera.h b/include/linux/irqchip/irq-madera.h
> > index 1160fa3769ae6..3a46cadd38654 100644
> > --- a/include/linux/irqchip/irq-madera.h
> > +++ b/include/linux/irqchip/irq-madera.h
> > @@ -1,4 +1,4 @@
> > -/* SPDX-License-Identifier: GPL-2.0 */
> > +/* SPDX-License-Identifier: GPL-2.0-only */
>
> I'm not sure this changes anything. LICENSES/preferred/GPL-2.0 doesn't
> seem to distinguish the two tags.
>
> Thomas, what do you think?
>

I have no objection to dropping the patch if this makes no
difference, just realised all the recent SPDX patches had been
using the -only version and assumed that was the preferred
version for v2 only.

Thanks,
Charles