2020-04-30 14:57:39

by Emmanuel Vadot

[permalink] [raw]
Subject: [RESEND 2/2] drm/format_helper: Dual licence the header in GPL-2 and MIT

Source file was dual licenced but the header was omitted, fix that.
Contributors for this file are:
Noralf Trønnes <[email protected]>
Gerd Hoffmann <[email protected]>
Thomas Gleixner <[email protected]>

Acked-by: Gerd Hoffmann <[email protected]>
Acked-by: Noralf Trønnes <[email protected]>
Signed-off-by: Emmanuel Vadot <[email protected]>
---
include/drm/drm_format_helper.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/drm/drm_format_helper.h b/include/drm/drm_format_helper.h
index ac220aa1a245..7c5d4ffb2af2 100644
--- a/include/drm/drm_format_helper.h
+++ b/include/drm/drm_format_helper.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+/* SPDX-License-Identifier: GPL-2.0 or MIT */
/*
* Copyright (C) 2016 Noralf Trønnes
*/
--
2.25.1


2020-04-30 15:12:07

by Maxime Ripard

[permalink] [raw]
Subject: Re: [RESEND 2/2] drm/format_helper: Dual licence the header in GPL-2 and MIT

On Thu, Apr 30, 2020 at 04:55:37PM +0200, Emmanuel Vadot wrote:
> Source file was dual licenced but the header was omitted, fix that.
> Contributors for this file are:
> Noralf Tr?nnes <[email protected]>
> Gerd Hoffmann <[email protected]>
> Thomas Gleixner <[email protected]>
>
> Acked-by: Gerd Hoffmann <[email protected]>
> Acked-by: Noralf Tr?nnes <[email protected]>
> Signed-off-by: Emmanuel Vadot <[email protected]>
> ---
> include/drm/drm_format_helper.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/drm/drm_format_helper.h b/include/drm/drm_format_helper.h
> index ac220aa1a245..7c5d4ffb2af2 100644
> --- a/include/drm/drm_format_helper.h
> +++ b/include/drm/drm_format_helper.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0-or-later */
> +/* SPDX-License-Identifier: GPL-2.0 or MIT */

You changed the GPL license there, was that intentional?

Maxime

Attachments:
(No filename) (941.00 B)
 signature.asc (235.00 B)
 Download all attachments

2020-04-30 15:43:11

by Emmanuel Vadot

[permalink] [raw]
Subject: Re: [RESEND 2/2] drm/format_helper: Dual licence the header in GPL-2 and MIT

On Thu, 30 Apr 2020 17:06:34 +0200
Maxime Ripard <[email protected]> wrote:

> On Thu, Apr 30, 2020 at 04:55:37PM +0200, Emmanuel Vadot wrote:
> > Source file was dual licenced but the header was omitted, fix that.
> > Contributors for this file are:
> > Noralf Tr?nnes <[email protected]>
> > Gerd Hoffmann <[email protected]>
> > Thomas Gleixner <[email protected]>
> >
> > Acked-by: Gerd Hoffmann <[email protected]>
> > Acked-by: Noralf Tr?nnes <[email protected]>
> > Signed-off-by: Emmanuel Vadot <[email protected]>
> > ---
> > include/drm/drm_format_helper.h | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/include/drm/drm_format_helper.h b/include/drm/drm_format_helper.h
> > index ac220aa1a245..7c5d4ffb2af2 100644
> > --- a/include/drm/drm_format_helper.h
> > +++ b/include/drm/drm_format_helper.h
> > @@ -1,4 +1,4 @@
> > -/* SPDX-License-Identifier: GPL-2.0-or-later */
> > +/* SPDX-License-Identifier: GPL-2.0 or MIT */
>
> You changed the GPL license there, was that intentional?
>
> Maxime

No sorry, fixed in v2.
Thanks for noticing that.

--
Emmanuel Vadot <[email protected]>