Hello all,
We had a discussion a while back with Noralf where he said that he wouldn't
mind dual licence his work under GPL-2 and MIT.
Those files are a problem with BSDs as we cannot include them.
For drm_client.c the main contributors are Noralf Trønnes and Thomas
Zimmermann, the other commits are just catch ups from changes elsewhere
(return values, struct member names, function renames etc ...).
For drm_format_helper the main contributors are Noralf Trønnes and
Gerd Hoffmann. Same comment as for drm_client.c for the other commits.
Emmanuel Vadot (2):
drm/client: Dual licence the file in GPL-2 and MIT
drm/format_helper: Dual licence the file in GPL 2 and MIT
drivers/gpu/drm/drm_client.c | 2 +-
drivers/gpu/drm/drm_format_helper.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
2.25.0
From: Emmanuel Vadot <[email protected]>
Contributors for this file are :
Chris Wilson <[email protected]>
Denis Efremov <[email protected]>
Jani Nikula <[email protected]>
Maxime Ripard <[email protected]>
Noralf Trønnes <[email protected]>
Sam Ravnborg <[email protected]>
Thomas Zimmermann <[email protected]>
Signed-off-by: Emmanuel Vadot <[email protected]>
---
drivers/gpu/drm/drm_client.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_client.c b/drivers/gpu/drm/drm_client.c
index b031b45aa8ef..6b0c6ef8b9b3 100644
--- a/drivers/gpu/drm/drm_client.c
+++ b/drivers/gpu/drm/drm_client.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0 or MIT
/*
* Copyright 2018 Noralf Trønnes
*/
--
2.25.0
From: Emmanuel Vadot <[email protected]>
Contributors for this file are :
Gerd Hoffmann <[email protected]>
Maxime Ripard <[email protected]>
Noralf Trønnes <[email protected]>
Signed-off-by: Emmanuel Vadot <[email protected]>
---
drivers/gpu/drm/drm_format_helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_format_helper.c b/drivers/gpu/drm/drm_format_helper.c
index 0897cb9aeaff..3b818f2b2392 100644
--- a/drivers/gpu/drm/drm_format_helper.c
+++ b/drivers/gpu/drm/drm_format_helper.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+// SPDX-License-Identifier: GPL-2.0 or MIT
/*
* Copyright (C) 2016 Noralf Trønnes
*
--
2.25.0
On Sat, 15 Feb 2020, Emmanuel Vadot <[email protected]> wrote:
> From: Emmanuel Vadot <[email protected]>
>
> Contributors for this file are :
> Chris Wilson <[email protected]>
> Denis Efremov <[email protected]>
> Jani Nikula <[email protected]>
> Maxime Ripard <[email protected]>
> Noralf Trønnes <[email protected]>
> Sam Ravnborg <[email protected]>
> Thomas Zimmermann <[email protected]>
>
> Signed-off-by: Emmanuel Vadot <[email protected]>
I've only converted some logging.
Acked-by: Jani Nikula <[email protected]>
> ---
> drivers/gpu/drm/drm_client.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_client.c b/drivers/gpu/drm/drm_client.c
> index b031b45aa8ef..6b0c6ef8b9b3 100644
> --- a/drivers/gpu/drm/drm_client.c
> +++ b/drivers/gpu/drm/drm_client.c
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +// SPDX-License-Identifier: GPL-2.0 or MIT
> /*
> * Copyright 2018 Noralf Trønnes
> */
--
Jani Nikula, Intel Open Source Graphics Center
Hi Emmanuel.
On Sat, Feb 15, 2020 at 07:09:09PM +0100, Emmanuel Vadot wrote:
> Hello all,
>
> We had a discussion a while back with Noralf where he said that he wouldn't
> mind dual licence his work under GPL-2 and MIT.
> Those files are a problem with BSDs as we cannot include them.
> For drm_client.c the main contributors are Noralf Tr?nnes and Thomas
> Zimmermann, the other commits are just catch ups from changes elsewhere
> (return values, struct member names, function renames etc ...).
> For drm_format_helper the main contributors are Noralf Tr?nnes and
> Gerd Hoffmann. Same comment as for drm_client.c for the other commits.
>
> Emmanuel Vadot (2):
> drm/client: Dual licence the file in GPL-2 and MIT
> drm/format_helper: Dual licence the file in GPL 2 and MIT
>
> drivers/gpu/drm/drm_client.c | 2 +-
> drivers/gpu/drm/drm_format_helper.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
I have made a minimal change to drm_client.c
Therefore my acks count only for a very little - but here it is:
Acked-by: Sam Ravnborg <[email protected]> [for my drm_client.c edits]
Sam
Den 15.02.2020 19.09, skrev Emmanuel Vadot:
> From: Emmanuel Vadot <[email protected]>
>
> Contributors for this file are :
> Chris Wilson <[email protected]>
> Denis Efremov <[email protected]>
> Jani Nikula <[email protected]>
> Maxime Ripard <[email protected]>
> Noralf Trønnes <[email protected]>
> Sam Ravnborg <[email protected]>
> Thomas Zimmermann <[email protected]>
>
> Signed-off-by: Emmanuel Vadot <[email protected]>
> ---
Acked-by: Noralf Trønnes <[email protected]>
Den 15.02.2020 19.09, skrev Emmanuel Vadot:
> From: Emmanuel Vadot <[email protected]>
>
> Contributors for this file are :
> Gerd Hoffmann <[email protected]>
> Maxime Ripard <[email protected]>
> Noralf Trønnes <[email protected]>
>
> Signed-off-by: Emmanuel Vadot <[email protected]>
> ---
Acked-by: Noralf Trønnes <[email protected]>
15.02.2020 21:09, Emmanuel Vadot пишет:
> From: Emmanuel Vadot <[email protected]>
>
> Contributors for this file are :
> Chris Wilson <[email protected]>
> Denis Efremov <[email protected]>
> Jani Nikula <[email protected]>
> Maxime Ripard <[email protected]>
> Noralf Trønnes <[email protected]>
> Sam Ravnborg <[email protected]>
> Thomas Zimmermann <[email protected]>
>
> Signed-off-by: Emmanuel Vadot <[email protected]>
Acked-by: Denis Efremov <[email protected]>
for my one-line patch.
Thanks,
Denis
> ---
> drivers/gpu/drm/drm_client.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_client.c b/drivers/gpu/drm/drm_client.c
> index b031b45aa8ef..6b0c6ef8b9b3 100644
> --- a/drivers/gpu/drm/drm_client.c
> +++ b/drivers/gpu/drm/drm_client.c
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +// SPDX-License-Identifier: GPL-2.0 or MIT
> /*
> * Copyright 2018 Noralf Trønnes
> */
>
On Sat, Feb 15, 2020 at 07:09:09PM +0100, Emmanuel Vadot wrote:
> Hello all,
>
> We had a discussion a while back with Noralf where he said that he wouldn't
> mind dual licence his work under GPL-2 and MIT.
> Those files are a problem with BSDs as we cannot include them.
> For drm_client.c the main contributors are Noralf Tr?nnes and Thomas
> Zimmermann, the other commits are just catch ups from changes elsewhere
> (return values, struct member names, function renames etc ...).
> For drm_format_helper the main contributors are Noralf Tr?nnes and
> Gerd Hoffmann. Same comment as for drm_client.c for the other commits.
>
> Emmanuel Vadot (2):
> drm/client: Dual licence the file in GPL-2 and MIT
> drm/format_helper: Dual licence the file in GPL 2 and MIT
Acked-by: Maxime Ripard <[email protected]>
Maxime
On Sat, Feb 15, 2020 at 07:09:11PM +0100, Emmanuel Vadot wrote:
> From: Emmanuel Vadot <[email protected]>
>
> Contributors for this file are :
> Gerd Hoffmann <[email protected]>
> Maxime Ripard <[email protected]>
> Noralf Tr?nnes <[email protected]>
>
> Signed-off-by: Emmanuel Vadot <[email protected]>
> ---
> drivers/gpu/drm/drm_format_helper.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_format_helper.c b/drivers/gpu/drm/drm_format_helper.c
> index 0897cb9aeaff..3b818f2b2392 100644
> --- a/drivers/gpu/drm/drm_format_helper.c
> +++ b/drivers/gpu/drm/drm_format_helper.c
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +// SPDX-License-Identifier: GPL-2.0 or MIT
> /*
> * Copyright (C) 2016 Noralf Tr?nnes
> *
Acked-by: Gerd Hoffmann <[email protected]>
> --
> 2.25.0
>
Hi
Am 15.02.20 um 19:09 schrieb Emmanuel Vadot:
> Hello all,
>
> We had a discussion a while back with Noralf where he said that he wouldn't
> mind dual licence his work under GPL-2 and MIT.
> Those files are a problem with BSDs as we cannot include them.
> For drm_client.c the main contributors are Noralf Trønnes and Thomas
> Zimmermann, the other commits are just catch ups from changes elsewhere
> (return values, struct member names, function renames etc ...).
> For drm_format_helper the main contributors are Noralf Trønnes and
> Gerd Hoffmann. Same comment as for drm_client.c for the other commits.
>
> Emmanuel Vadot (2):
> drm/client: Dual licence the file in GPL-2 and MIT
> drm/format_helper: Dual licence the file in GPL 2 and MIT
>
> drivers/gpu/drm/drm_client.c | 2 +-
> drivers/gpu/drm/drm_format_helper.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
For the patches I contributed:
Acked-by: Thomas Zimmermann <[email protected]>
Best regards
Thomas
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
On Sat, Feb 15, 2020 at 07:09:11PM +0100, Emmanuel Vadot wrote:
> From: Emmanuel Vadot <[email protected]>
>
> Contributors for this file are :
> Gerd Hoffmann <[email protected]>
> Maxime Ripard <[email protected]>
> Noralf Tr?nnes <[email protected]>
>
> Signed-off-by: Emmanuel Vadot <[email protected]>
Patch applied since we have all the acks we need. I think for the first
one we still need a few more.
-Daniel
> ---
> drivers/gpu/drm/drm_format_helper.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_format_helper.c b/drivers/gpu/drm/drm_format_helper.c
> index 0897cb9aeaff..3b818f2b2392 100644
> --- a/drivers/gpu/drm/drm_format_helper.c
> +++ b/drivers/gpu/drm/drm_format_helper.c
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +// SPDX-License-Identifier: GPL-2.0 or MIT
> /*
> * Copyright (C) 2016 Noralf Tr?nnes
> *
> --
> 2.25.0
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Quoting Jani Nikula (2020-02-15 18:33:09)
> On Sat, 15 Feb 2020, Emmanuel Vadot <[email protected]> wrote:
> > From: Emmanuel Vadot <[email protected]>
> >
> > Contributors for this file are :
> > Chris Wilson <[email protected]>
> > Denis Efremov <[email protected]>
> > Jani Nikula <[email protected]>
> > Maxime Ripard <[email protected]>
> > Noralf Trønnes <[email protected]>
> > Sam Ravnborg <[email protected]>
> > Thomas Zimmermann <[email protected]>
> >
> > Signed-off-by: Emmanuel Vadot <[email protected]>
>
> I've only converted some logging.
>
> Acked-by: Jani Nikula <[email protected]>
Bonus ack from another Intel employee to cover all Intel copyright in
this file,
Acked-by: Chris Wilson <[email protected]>
-Chris
On Mon, 24 Feb 2020 11:40:38 +0000
Chris Wilson <[email protected]> wrote:
> Quoting Jani Nikula (2020-02-15 18:33:09)
> > On Sat, 15 Feb 2020, Emmanuel Vadot <[email protected]> wrote:
> > > From: Emmanuel Vadot <[email protected]>
> > >
> > > Contributors for this file are :
> > > Chris Wilson <[email protected]>
> > > Denis Efremov <[email protected]>
> > > Jani Nikula <[email protected]>
> > > Maxime Ripard <[email protected]>
> > > Noralf Tr?nnes <[email protected]>
> > > Sam Ravnborg <[email protected]>
> > > Thomas Zimmermann <[email protected]>
> > >
> > > Signed-off-by: Emmanuel Vadot <[email protected]>
> >
> > I've only converted some logging.
> >
> > Acked-by: Jani Nikula <[email protected]>
>
> Bonus ack from another Intel employee to cover all Intel copyright in
> this file,
> Acked-by: Chris Wilson <[email protected]>
> -Chris
Thanks Chris,
Daniel, if I'm counting right this was the last ack needed.
--
Emmanuel Vadot <[email protected]>
On Tue, Feb 25, 2020 at 09:18:10AM +0100, Emmanuel Vadot wrote:
> On Mon, 24 Feb 2020 11:40:38 +0000
> Chris Wilson <[email protected]> wrote:
>
> > Quoting Jani Nikula (2020-02-15 18:33:09)
> > > On Sat, 15 Feb 2020, Emmanuel Vadot <[email protected]> wrote:
> > > > From: Emmanuel Vadot <[email protected]>
> > > >
> > > > Contributors for this file are :
> > > > Chris Wilson <[email protected]>
> > > > Denis Efremov <[email protected]>
> > > > Jani Nikula <[email protected]>
> > > > Maxime Ripard <[email protected]>
> > > > Noralf Tr?nnes <[email protected]>
> > > > Sam Ravnborg <[email protected]>
> > > > Thomas Zimmermann <[email protected]>
> > > >
> > > > Signed-off-by: Emmanuel Vadot <[email protected]>
> > >
> > > I've only converted some logging.
> > >
> > > Acked-by: Jani Nikula <[email protected]>
> >
> > Bonus ack from another Intel employee to cover all Intel copyright in
> > this file,
> > Acked-by: Chris Wilson <[email protected]>
> > -Chris
>
> Thanks Chris,
>
> Daniel, if I'm counting right this was the last ack needed.
I'm counting the same, patch applied and thanks for taking care of the
paperwork pushing here.
Thanks, Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Den 25.02.2020 18.03, skrev Daniel Vetter:
> On Tue, Feb 25, 2020 at 09:18:10AM +0100, Emmanuel Vadot wrote:
>> On Mon, 24 Feb 2020 11:40:38 +0000
>> Chris Wilson <[email protected]> wrote:
>>
>>> Quoting Jani Nikula (2020-02-15 18:33:09)
>>>> On Sat, 15 Feb 2020, Emmanuel Vadot <[email protected]> wrote:
>>>>> From: Emmanuel Vadot <[email protected]>
>>>>>
>>>>> Contributors for this file are :
>>>>> Chris Wilson <[email protected]>
>>>>> Denis Efremov <[email protected]>
>>>>> Jani Nikula <[email protected]>
>>>>> Maxime Ripard <[email protected]>
>>>>> Noralf Trønnes <[email protected]>
>>>>> Sam Ravnborg <[email protected]>
>>>>> Thomas Zimmermann <[email protected]>
>>>>>
>>>>> Signed-off-by: Emmanuel Vadot <[email protected]>
>>>>
>>>> I've only converted some logging.
>>>>
>>>> Acked-by: Jani Nikula <[email protected]>
>>>
>>> Bonus ack from another Intel employee to cover all Intel copyright in
>>> this file,
>>> Acked-by: Chris Wilson <[email protected]>
>>> -Chris
>>
>> Thanks Chris,
>>
>> Daniel, if I'm counting right this was the last ack needed.
>
> I'm counting the same, patch applied and thanks for taking care of the
> paperwork pushing here.
>
Looks like it got lost somehow, I can't find it in drm-tip at least.
Noralf.
> Thanks, Daniel
>
On Fri, Feb 28, 2020 at 01:28:57PM +0100, Noralf Tr?nnes wrote:
>
>
> Den 25.02.2020 18.03, skrev Daniel Vetter:
> > On Tue, Feb 25, 2020 at 09:18:10AM +0100, Emmanuel Vadot wrote:
> >> On Mon, 24 Feb 2020 11:40:38 +0000
> >> Chris Wilson <[email protected]> wrote:
> >>
> >>> Quoting Jani Nikula (2020-02-15 18:33:09)
> >>>> On Sat, 15 Feb 2020, Emmanuel Vadot <[email protected]> wrote:
> >>>>> From: Emmanuel Vadot <[email protected]>
> >>>>>
> >>>>> Contributors for this file are :
> >>>>> Chris Wilson <[email protected]>
> >>>>> Denis Efremov <[email protected]>
> >>>>> Jani Nikula <[email protected]>
> >>>>> Maxime Ripard <[email protected]>
> >>>>> Noralf Tr?nnes <[email protected]>
> >>>>> Sam Ravnborg <[email protected]>
> >>>>> Thomas Zimmermann <[email protected]>
> >>>>>
> >>>>> Signed-off-by: Emmanuel Vadot <[email protected]>
> >>>>
> >>>> I've only converted some logging.
> >>>>
> >>>> Acked-by: Jani Nikula <[email protected]>
> >>>
> >>> Bonus ack from another Intel employee to cover all Intel copyright in
> >>> this file,
> >>> Acked-by: Chris Wilson <[email protected]>
> >>> -Chris
> >>
> >> Thanks Chris,
> >>
> >> Daniel, if I'm counting right this was the last ack needed.
> >
> > I'm counting the same, patch applied and thanks for taking care of the
> > paperwork pushing here.
> >
>
> Looks like it got lost somehow, I can't find it in drm-tip at least.
Sry got stuck in my script, I kicked now.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch