Replace GPL license statements with SPDX GPL-2.0 license identifiers
and and correct the module license to GPLv2.
Signed-off-by: Shuah Khan <[email protected]>
---
drivers/leds/trigger/ledtrig-transient.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/leds/trigger/ledtrig-transient.c b/drivers/leds/trigger/ledtrig-transient.c
index 7acce64b692a..f0578af858e7 100644
--- a/drivers/leds/trigger/ledtrig-transient.c
+++ b/drivers/leds/trigger/ledtrig-transient.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* LED Kernel Transient Trigger
*
@@ -8,10 +9,6 @@
* Design and use-case input from Jonas Bonn <[email protected]> and
* Neil Brown <[email protected]>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
*/
/*
* Transient trigger allows one shot timer activation. Please refer to
@@ -238,4 +235,4 @@ module_exit(transient_trig_exit);
MODULE_AUTHOR("Shuah Khan <[email protected]>");
MODULE_DESCRIPTION("Transient LED trigger");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
--
2.14.1
Replace GPL license statement with SPDX GPL-2.0 license identifier.
Signed-off-by: Shuah Khan <[email protected]>
---
drivers/media/v4l2-core/v4l2-mc.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-mc.c b/drivers/media/v4l2-core/v4l2-mc.c
index 303980b71aae..1297132acd4e 100644
--- a/drivers/media/v4l2-core/v4l2-mc.c
+++ b/drivers/media/v4l2-core/v4l2-mc.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Media Controller ancillary functions
*
@@ -5,16 +6,6 @@
* Copyright (C) 2016 Shuah Khan <[email protected]>
* Copyright (C) 2006-2010 Nokia Corporation
* Copyright (c) 2016 Intel Corporation.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
*/
#include <linux/module.h>
--
2.14.1
Replace GPL license statement with SPDX GPL-2.0 license identifier.
Signed-off-by: Shuah Khan <[email protected]>
---
tools/testing/selftests/media_tests/media_device_open.c | 2 +-
tools/testing/selftests/media_tests/media_device_test.c | 2 +-
tools/testing/selftests/media_tests/video_device_test.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/media_tests/media_device_open.c b/tools/testing/selftests/media_tests/media_device_open.c
index 44343c091a20..2a53dd1328e1 100644
--- a/tools/testing/selftests/media_tests/media_device_open.c
+++ b/tools/testing/selftests/media_tests/media_device_open.c
@@ -1,10 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* media_device_open.c - Media Controller Device Open Test
*
* Copyright (c) 2016 Shuah Khan <[email protected]>
* Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
- * This file is released under the GPLv2.
*/
/*
diff --git a/tools/testing/selftests/media_tests/media_device_test.c b/tools/testing/selftests/media_tests/media_device_test.c
index 5d49943e77d0..d74d10283a35 100644
--- a/tools/testing/selftests/media_tests/media_device_test.c
+++ b/tools/testing/selftests/media_tests/media_device_test.c
@@ -1,10 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* media_device_test.c - Media Controller Device ioctl loop Test
*
* Copyright (c) 2016 Shuah Khan <[email protected]>
* Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
- * This file is released under the GPLv2.
*/
/*
diff --git a/tools/testing/selftests/media_tests/video_device_test.c b/tools/testing/selftests/media_tests/video_device_test.c
index 66d419c28653..81bac9b34028 100644
--- a/tools/testing/selftests/media_tests/video_device_test.c
+++ b/tools/testing/selftests/media_tests/video_device_test.c
@@ -1,10 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* video_device_test - Video Device Test
*
* Copyright (c) 2016 Shuah Khan <[email protected]>
* Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
- * This file is released under the GPLv2.
*/
/*
--
2.14.1
Replace GPL license statement with SPDX GPL-2.0 license identifier.
Signed-off-by: Shuah Khan <[email protected]>
---
tools/testing/selftests/kselftest.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/testing/selftests/kselftest.h b/tools/testing/selftests/kselftest.h
index 1ae565ed9bf0..1a52b03962a3 100644
--- a/tools/testing/selftests/kselftest.h
+++ b/tools/testing/selftests/kselftest.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* kselftest.h: kselftest framework return codes to include from
* selftests.
@@ -5,7 +6,6 @@
* Copyright (c) 2014 Shuah Khan <[email protected]>
* Copyright (c) 2014 Samsung Electronics Co., Ltd.
*
- * This file is released under the GPLv2.
*/
#ifndef __KSELFTEST_H
#define __KSELFTEST_H
--
2.14.1
Replace GPL license statement with SPDX GPL-2.0 license identifier.
Signed-off-by: Shuah Khan <[email protected]>
---
tools/testing/selftests/kselftest_install.sh | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/tools/testing/selftests/kselftest_install.sh b/tools/testing/selftests/kselftest_install.sh
index 1555fbdb08da..ec304463883c 100755
--- a/tools/testing/selftests/kselftest_install.sh
+++ b/tools/testing/selftests/kselftest_install.sh
@@ -1,13 +1,11 @@
#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
#
# Kselftest Install
# Install kselftest tests
# Author: Shuah Khan <[email protected]>
# Copyright (C) 2015 Samsung Electronics Co., Ltd.
-# This software may be freely redistributed under the terms of the GNU
-# General Public License (GPLv2).
-
install_loc=`pwd`
main()
--
2.14.1
Replace GPL license statement with SPDX GPL-2.0 license identifier.
Signed-off-by: Shuah Khan <[email protected]>
---
tools/testing/selftests/gen_kselftest_tar.sh | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/tools/testing/selftests/gen_kselftest_tar.sh b/tools/testing/selftests/gen_kselftest_tar.sh
index 17d5bd0c0936..a27e2eec3586 100755
--- a/tools/testing/selftests/gen_kselftest_tar.sh
+++ b/tools/testing/selftests/gen_kselftest_tar.sh
@@ -1,13 +1,11 @@
#!/bin/bash
#
+# SPDX-License-Identifier: GPL-2.0
# gen_kselftest_tar
# Generate kselftest tarball
# Author: Shuah Khan <[email protected]>
# Copyright (C) 2015 Samsung Electronics Co., Ltd.
-# This software may be freely redistributed under the terms of the GNU
-# General Public License (GPLv2).
-
# main
main()
{
--
2.14.1
Hi Shuah,
Thanks for the patch.
On 01/10/2018 05:35 PM, Shuah Khan wrote:
> Replace GPL license statements with SPDX GPL-2.0 license identifiers
> and and correct the module license to GPLv2.
>
> Signed-off-by: Shuah Khan <[email protected]>
> ---
> drivers/leds/trigger/ledtrig-transient.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/leds/trigger/ledtrig-transient.c b/drivers/leds/trigger/ledtrig-transient.c
> index 7acce64b692a..f0578af858e7 100644
> --- a/drivers/leds/trigger/ledtrig-transient.c
> +++ b/drivers/leds/trigger/ledtrig-transient.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> /*
How about changing this whole block comment to "//"?
We did it already for drivers/leds/trigger/ledtrig-netdev.c,
present in linux-next. See related discussion with reference
to relevant Linus' guidelines in this matter [0].
> * LED Kernel Transient Trigger
> *
> @@ -8,10 +9,6 @@
> * Design and use-case input from Jonas Bonn <[email protected]> and
> * Neil Brown <[email protected]>
> *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 as
> - * published by the Free Software Foundation.
> - *
> */
> /*
> * Transient trigger allows one shot timer activation. Please refer to
> @@ -238,4 +235,4 @@ module_exit(transient_trig_exit);
>
> MODULE_AUTHOR("Shuah Khan <[email protected]>");
> MODULE_DESCRIPTION("Transient LED trigger");
> -MODULE_LICENSE("GPL");
> +MODULE_LICENSE("GPL v2");
>
[0] https://www.mail-archive.com/[email protected]/msg204598.html
--
Best regards,
Jacek Anaszewski
On 01/10/2018 01:40 PM, Jacek Anaszewski wrote:
> Hi Shuah,
>
> Thanks for the patch.
>
> On 01/10/2018 05:35 PM, Shuah Khan wrote:
>> Replace GPL license statements with SPDX GPL-2.0 license identifiers
>> and and correct the module license to GPLv2.
>>
>> Signed-off-by: Shuah Khan <[email protected]>
>> ---
>> drivers/leds/trigger/ledtrig-transient.c | 7 ++-----
>> 1 file changed, 2 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/leds/trigger/ledtrig-transient.c b/drivers/leds/trigger/ledtrig-transient.c
>> index 7acce64b692a..f0578af858e7 100644
>> --- a/drivers/leds/trigger/ledtrig-transient.c
>> +++ b/drivers/leds/trigger/ledtrig-transient.c
>> @@ -1,3 +1,4 @@
>> +/* SPDX-License-Identifier: GPL-2.0 */
>> /*
>
> How about changing this whole block comment to "//"?
> We did it already for drivers/leds/trigger/ledtrig-netdev.c,
> present in linux-next. See related discussion with reference
> to relevant Linus' guidelines in this matter [0].
>
v2 is on its way.
thanks,
-- Shuah
Hi Shuah,
Thank you for the patch.
On Wednesday, 10 January 2018 18:35:36 EET Shuah Khan wrote:
> Replace GPL license statement with SPDX GPL-2.0 license identifier.
>
> Signed-off-by: Shuah Khan <[email protected]>
> ---
> drivers/media/v4l2-core/v4l2-mc.c | 11 +----------
> 1 file changed, 1 insertion(+), 10 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-mc.c
> b/drivers/media/v4l2-core/v4l2-mc.c index 303980b71aae..1297132acd4e 100644
> --- a/drivers/media/v4l2-core/v4l2-mc.c
> +++ b/drivers/media/v4l2-core/v4l2-mc.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
The header doesn't match the existing license.
Furthermore, unless I'm mistaken, the standard comment style for SPDX headers
in the kernel is //, not /* ... */
> /*
> * Media Controller ancillary functions
> *
> @@ -5,16 +6,6 @@
> * Copyright (C) 2016 Shuah Khan <[email protected]>
> * Copyright (C) 2006-2010 Nokia Corporation
> * Copyright (c) 2016 Intel Corporation.
> - *
> - * 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.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> - * GNU General Public License for more details.
> */
>
> #include <linux/module.h>
--
Regards,
Laurent Pinchart
On 01/11/2018 05:55 AM, Laurent Pinchart wrote:
> Hi Shuah,
>
> Thank you for the patch.
>
> On Wednesday, 10 January 2018 18:35:36 EET Shuah Khan wrote:
>> Replace GPL license statement with SPDX GPL-2.0 license identifier.
>>
>> Signed-off-by: Shuah Khan <[email protected]>
>> ---
>> drivers/media/v4l2-core/v4l2-mc.c | 11 +----------
>> 1 file changed, 1 insertion(+), 10 deletions(-)
>>
>> diff --git a/drivers/media/v4l2-core/v4l2-mc.c
>> b/drivers/media/v4l2-core/v4l2-mc.c index 303980b71aae..1297132acd4e 100644
>> --- a/drivers/media/v4l2-core/v4l2-mc.c
>> +++ b/drivers/media/v4l2-core/v4l2-mc.c
>> @@ -1,3 +1,4 @@
>> +/* SPDX-License-Identifier: GPL-2.0 */
>
> The header doesn't match the existing license.
When I added the file, I must have cut and pasted the license statement
from another file. More on this below the deleted license lines.
>
> Furthermore, unless I'm mistaken, the standard comment style for SPDX headers
> in the kernel is //, not /* ... */
Looks like we have 3 conventions for SPDX comment style.
/* ... */ for headers and # ... for shell scripts and
// for .c files.
I can update it it and send v2 provided we think the change is inline
with the original license.
>
>> /*
>> * Media Controller ancillary functions
>> *
>> @@ -5,16 +6,6 @@
>> * Copyright (C) 2016 Shuah Khan <[email protected]>
>> * Copyright (C) 2006-2010 Nokia Corporation
>> * Copyright (c) 2016 Intel Corporation.
>> - *
>> - * 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.
Are you concerned about the "or (at your option) any later version." part
that it doesn't match?
>> - *
>> - * This program is distributed in the hope that it will be useful,
>> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> - * GNU General Public License for more details.
>> */
>>
>> #include <linux/module.h>
>
thanks,
-- Shuah
Hi Shuah,
On Thursday, 11 January 2018 17:45:15 EET Shuah Khan wrote:
> On 01/11/2018 05:55 AM, Laurent Pinchart wrote:
> > On Wednesday, 10 January 2018 18:35:36 EET Shuah Khan wrote:
> >> Replace GPL license statement with SPDX GPL-2.0 license identifier.
> >>
> >> Signed-off-by: Shuah Khan <[email protected]>
> >> ---
> >>
> >> drivers/media/v4l2-core/v4l2-mc.c | 11 +----------
> >> 1 file changed, 1 insertion(+), 10 deletions(-)
> >>
> >> diff --git a/drivers/media/v4l2-core/v4l2-mc.c
> >> b/drivers/media/v4l2-core/v4l2-mc.c index 303980b71aae..1297132acd4e
> >> 100644
> >> --- a/drivers/media/v4l2-core/v4l2-mc.c
> >> +++ b/drivers/media/v4l2-core/v4l2-mc.c
> >> @@ -1,3 +1,4 @@
> >> +/* SPDX-License-Identifier: GPL-2.0 */
> >
> > The header doesn't match the existing license.
>
> When I added the file, I must have cut and pasted the license statement
> from another file. More on this below the deleted license lines.
>
> > Furthermore, unless I'm mistaken, the standard comment style for SPDX
> > headers in the kernel is //, not /* ... */
>
> Looks like we have 3 conventions for SPDX comment style.
> /* ... */ for headers and # ... for shell scripts and
> // for .c files.
>
> I can update it it and send v2 provided we think the change is inline
> with the original license.
Personally I prefer the /* ... */ comment style, but I noticed that Greg used
// in his large patch the adds SPDX license headers, so I think we should
follow the established practice. I'll let you investigate to find what is
preferred :)
> >> /*
> >>
> >> * Media Controller ancillary functions
> >> *
> >>
> >> @@ -5,16 +6,6 @@
> >>
> >> * Copyright (C) 2016 Shuah Khan <[email protected]>
> >> * Copyright (C) 2006-2010 Nokia Corporation
> >> * Copyright (c) 2016 Intel Corporation.
> >>
> >> - *
> >> - * 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.
>
> Are you concerned about the "or (at your option) any later version." part
> that it doesn't match?
Yes, that's my concern. I'm personally fine with GPL-2.0-only, but you'll have
a hard time contacting all the other copyright holders if you want to
relicense this. Good luck getting hold of the appropriate legal department at
Nokia :-)
On a related note, I nowadays encourage developers to keep their copyright on
code they wrote when possible, and to at least negotiate that with their
employers.
> >> - *
> >> - * This program is distributed in the hope that it will be useful,
> >> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> >> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> >> - * GNU General Public License for more details.
> >> */
> >>
> >> #include <linux/module.h>
--
Regards,
Laurent Pinchart
On 01/11/2018 11:42 AM, Laurent Pinchart wrote:
> Hi Shuah,
>
> On Thursday, 11 January 2018 17:45:15 EET Shuah Khan wrote:
>> On 01/11/2018 05:55 AM, Laurent Pinchart wrote:
>>> On Wednesday, 10 January 2018 18:35:36 EET Shuah Khan wrote:
>>>> Replace GPL license statement with SPDX GPL-2.0 license identifier.
>>>>
>>>> Signed-off-by: Shuah Khan <[email protected]>
>>>> ---
>>>>
>>>> drivers/media/v4l2-core/v4l2-mc.c | 11 +----------
>>>> 1 file changed, 1 insertion(+), 10 deletions(-)
>>>>
>>>> diff --git a/drivers/media/v4l2-core/v4l2-mc.c
>>>> b/drivers/media/v4l2-core/v4l2-mc.c index 303980b71aae..1297132acd4e
>>>> 100644
>>>> --- a/drivers/media/v4l2-core/v4l2-mc.c
>>>> +++ b/drivers/media/v4l2-core/v4l2-mc.c
>>>> @@ -1,3 +1,4 @@
>>>> +/* SPDX-License-Identifier: GPL-2.0 */
>>>
>>> The header doesn't match the existing license.
>>
>> When I added the file, I must have cut and pasted the license statement
>> from another file. More on this below the deleted license lines.
>>
>>> Furthermore, unless I'm mistaken, the standard comment style for SPDX
>>> headers in the kernel is //, not /* ... */
>>
>> Looks like we have 3 conventions for SPDX comment style.
>> /* ... */ for headers and # ... for shell scripts and
>> // for .c files.
>>
>> I can update it it and send v2 provided we think the change is inline
>> with the original license.
>
> Personally I prefer the /* ... */ comment style, but I noticed that Greg used
> // in his large patch the adds SPDX license headers, so I think we should
> follow the established practice. I'll let you investigate to find what is
> preferred :)
Yeah /*...*/ is my preferred as well. Hence the autopilot change I made
in the first place. I redid a couple of patches already to follow the
// convention and I can do the same here.
>
>>>> /*
>>>>
>>>> * Media Controller ancillary functions
>>>> *
>>>>
>>>> @@ -5,16 +6,6 @@
>>>>
>>>> * Copyright (C) 2016 Shuah Khan <[email protected]>
>>>> * Copyright (C) 2006-2010 Nokia Corporation
>>>> * Copyright (c) 2016 Intel Corporation.
>>>>
>>>> - *
>>>> - * 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.
>>
>> Are you concerned about the "or (at your option) any later version." part
>> that it doesn't match?
>
> Yes, that's my concern. I'm personally fine with GPL-2.0-only, but you'll have
> a hard time contacting all the other copyright holders if you want to
> relicense this. Good luck getting hold of the appropriate legal department at
> Nokia :-)
Yeah. I don't think it is beneficial to continue this effort. I am going to not
pursue the patch at this file. Thanks for the review.
thanks,
-- Shuah
Hi Shuah,
On Thursday, 11 January 2018 22:44:08 EET Shuah Khan wrote:
> On 01/11/2018 11:42 AM, Laurent Pinchart wrote:
> > On Thursday, 11 January 2018 17:45:15 EET Shuah Khan wrote:
> >> On 01/11/2018 05:55 AM, Laurent Pinchart wrote:
> >>> On Wednesday, 10 January 2018 18:35:36 EET Shuah Khan wrote:
> >>>> Replace GPL license statement with SPDX GPL-2.0 license identifier.
> >>>>
> >>>> Signed-off-by: Shuah Khan <[email protected]>
> >>>> ---
> >>>>
> >>>> drivers/media/v4l2-core/v4l2-mc.c | 11 +----------
> >>>> 1 file changed, 1 insertion(+), 10 deletions(-)
> >>>>
> >>>> diff --git a/drivers/media/v4l2-core/v4l2-mc.c
> >>>> b/drivers/media/v4l2-core/v4l2-mc.c index 303980b71aae..1297132acd4e
> >>>> 100644
> >>>> --- a/drivers/media/v4l2-core/v4l2-mc.c
> >>>> +++ b/drivers/media/v4l2-core/v4l2-mc.c
> >>>> @@ -1,3 +1,4 @@
> >>>> +/* SPDX-License-Identifier: GPL-2.0 */
> >>>
> >>> The header doesn't match the existing license.
> >>
> >> When I added the file, I must have cut and pasted the license statement
> >> from another file. More on this below the deleted license lines.
> >>
> >>> Furthermore, unless I'm mistaken, the standard comment style for SPDX
> >>> headers in the kernel is //, not /* ... */
> >>
> >> Looks like we have 3 conventions for SPDX comment style.
> >> /* ... */ for headers and # ... for shell scripts and
> >> // for .c files.
> >>
> >> I can update it it and send v2 provided we think the change is inline
> >> with the original license.
> >
> > Personally I prefer the /* ... */ comment style, but I noticed that Greg
> > used // in his large patch the adds SPDX license headers, so I think we
> > should follow the established practice. I'll let you investigate to find
> > what is preferred :)
>
> Yeah /*...*/ is my preferred as well. Hence the autopilot change I made
> in the first place. I redid a couple of patches already to follow the
> // convention and I can do the same here.
>
> >>>> /*
> >>>>
> >>>> * Media Controller ancillary functions
> >>>> *
> >>>>
> >>>> @@ -5,16 +6,6 @@
> >>>>
> >>>> * Copyright (C) 2016 Shuah Khan <[email protected]>
> >>>> * Copyright (C) 2006-2010 Nokia Corporation
> >>>> * Copyright (c) 2016 Intel Corporation.
> >>>>
> >>>> - *
> >>>> - * 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.
> >>
> >> Are you concerned about the "or (at your option) any later version." part
> >> that it doesn't match?
> >
> > Yes, that's my concern. I'm personally fine with GPL-2.0-only, but you'll
> > have a hard time contacting all the other copyright holders if you want
> > to relicense this. Good luck getting hold of the appropriate legal
> > department at Nokia :-)
>
> Yeah. I don't think it is beneficial to continue this effort. I am going to
> not pursue the patch at this file. Thanks for the review.
How about just using
// SPDX-License-Identifier: GPL-2.0-or-later
? That is equivalent to the current license text.
--
Regards,
Laurent Pinchart
On 01/11/2018 02:33 PM, Laurent Pinchart wrote:
> Hi Shuah,
>
> On Thursday, 11 January 2018 22:44:08 EET Shuah Khan wrote:
>> On 01/11/2018 11:42 AM, Laurent Pinchart wrote:
>>> On Thursday, 11 January 2018 17:45:15 EET Shuah Khan wrote:
>>>> On 01/11/2018 05:55 AM, Laurent Pinchart wrote:
>>>>> On Wednesday, 10 January 2018 18:35:36 EET Shuah Khan wrote:
>>>>>> Replace GPL license statement with SPDX GPL-2.0 license identifier.
>>>>>>
>>>>>> Signed-off-by: Shuah Khan <[email protected]>
>>>>>> ---
>>>>>>
>>>>>> drivers/media/v4l2-core/v4l2-mc.c | 11 +----------
>>>>>> 1 file changed, 1 insertion(+), 10 deletions(-)
>>>>>>
>>>>>> diff --git a/drivers/media/v4l2-core/v4l2-mc.c
>>>>>> b/drivers/media/v4l2-core/v4l2-mc.c index 303980b71aae..1297132acd4e
>>>>>> 100644
>>>>>> --- a/drivers/media/v4l2-core/v4l2-mc.c
>>>>>> +++ b/drivers/media/v4l2-core/v4l2-mc.c
>>>>>> @@ -1,3 +1,4 @@
>>>>>> +/* SPDX-License-Identifier: GPL-2.0 */
>>>>>
>>>>> The header doesn't match the existing license.
>>>>
>>>> When I added the file, I must have cut and pasted the license statement
>>>> from another file. More on this below the deleted license lines.
>>>>
>>>>> Furthermore, unless I'm mistaken, the standard comment style for SPDX
>>>>> headers in the kernel is //, not /* ... */
>>>>
>>>> Looks like we have 3 conventions for SPDX comment style.
>>>> /* ... */ for headers and # ... for shell scripts and
>>>> // for .c files.
>>>>
>>>> I can update it it and send v2 provided we think the change is inline
>>>> with the original license.
>>>
>>> Personally I prefer the /* ... */ comment style, but I noticed that Greg
>>> used // in his large patch the adds SPDX license headers, so I think we
>>> should follow the established practice. I'll let you investigate to find
>>> what is preferred :)
>>
>> Yeah /*...*/ is my preferred as well. Hence the autopilot change I made
>> in the first place. I redid a couple of patches already to follow the
>> // convention and I can do the same here.
>>
>>>>>> /*
>>>>>>
>>>>>> * Media Controller ancillary functions
>>>>>> *
>>>>>>
>>>>>> @@ -5,16 +6,6 @@
>>>>>>
>>>>>> * Copyright (C) 2016 Shuah Khan <[email protected]>
>>>>>> * Copyright (C) 2006-2010 Nokia Corporation
>>>>>> * Copyright (c) 2016 Intel Corporation.
>>>>>>
>>>>>> - *
>>>>>> - * 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.
>>>>
>>>> Are you concerned about the "or (at your option) any later version." part
>>>> that it doesn't match?
>>>
>>> Yes, that's my concern. I'm personally fine with GPL-2.0-only, but you'll
>>> have a hard time contacting all the other copyright holders if you want
>>> to relicense this. Good luck getting hold of the appropriate legal
>>> department at Nokia :-)
>>
>> Yeah. I don't think it is beneficial to continue this effort. I am going to
>> not pursue the patch at this file. Thanks for the review.
>
> How about just using
>
> // SPDX-License-Identifier: GPL-2.0-or-later
>
> ? That is equivalent to the current license text.
>
Hmm. Yes GPL-2.0-or-later would maintain the intent and doesn't change
the license. I can send v2 with that and see anybody objects to it.
thanks,
-- Shuah