From: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com
Change SPDX from GPL-2.0 to GPL-2.0-only for Intel-contributed code. This was explicit before the transition to SPDX and lost in translation.
No change to the dual-license parts, the only clarification is to the GPL-2.0 term.
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com Reviewed-by: Guennadi Liakhovetski guennadi.liakhovetski@linux.intel.com Signed-off-by: Bard Liao yung-chuan.liao@linux.intel.com --- drivers/soundwire/bus.c | 2 +- drivers/soundwire/bus.h | 2 +- drivers/soundwire/bus_type.c | 2 +- drivers/soundwire/cadence_master.c | 2 +- drivers/soundwire/cadence_master.h | 2 +- drivers/soundwire/intel.c | 2 +- drivers/soundwire/intel.h | 2 +- drivers/soundwire/intel_init.c | 2 +- drivers/soundwire/mipi_disco.c | 2 +- drivers/soundwire/slave.c | 2 +- drivers/soundwire/stream.c | 2 +- include/linux/soundwire/sdw.h | 2 +- include/linux/soundwire/sdw_intel.h | 2 +- include/linux/soundwire/sdw_registers.h | 2 +- include/linux/soundwire/sdw_type.h | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c index 24ba77226376..2289c2ac8c5a 100644 --- a/drivers/soundwire/bus.c +++ b/drivers/soundwire/bus.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) // Copyright(c) 2015-17 Intel Corporation.
#include <linux/acpi.h> diff --git a/drivers/soundwire/bus.h b/drivers/soundwire/bus.h index 82484f741168..697a5b371568 100644 --- a/drivers/soundwire/bus.h +++ b/drivers/soundwire/bus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */ /* Copyright(c) 2015-17 Intel Corporation. */
#ifndef __SDW_BUS_H diff --git a/drivers/soundwire/bus_type.c b/drivers/soundwire/bus_type.c index de9a671802b8..95a87d4e26c2 100644 --- a/drivers/soundwire/bus_type.c +++ b/drivers/soundwire/bus_type.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only // Copyright(c) 2015-17 Intel Corporation.
#include <linux/module.h> diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c index 9ea87538b9ef..fe238645ed2c 100644 --- a/drivers/soundwire/cadence_master.c +++ b/drivers/soundwire/cadence_master.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) // Copyright(c) 2015-17 Intel Corporation.
/* diff --git a/drivers/soundwire/cadence_master.h b/drivers/soundwire/cadence_master.h index b410656f8194..ea606b4fba76 100644 --- a/drivers/soundwire/cadence_master.h +++ b/drivers/soundwire/cadence_master.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */ /* Copyright(c) 2015-17 Intel Corporation. */ #include <sound/soc.h>
diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c index 4cfdd074e310..1eda63f488f5 100644 --- a/drivers/soundwire/intel.c +++ b/drivers/soundwire/intel.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) // Copyright(c) 2015-17 Intel Corporation.
/* diff --git a/drivers/soundwire/intel.h b/drivers/soundwire/intel.h index 38b7c125fb10..7b4af8018e1a 100644 --- a/drivers/soundwire/intel.h +++ b/drivers/soundwire/intel.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */ /* Copyright(c) 2015-17 Intel Corporation. */
#ifndef __SDW_INTEL_LOCAL_H diff --git a/drivers/soundwire/intel_init.c b/drivers/soundwire/intel_init.c index d5d42795a48f..947345d5c960 100644 --- a/drivers/soundwire/intel_init.c +++ b/drivers/soundwire/intel_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) // Copyright(c) 2015-17 Intel Corporation.
/* diff --git a/drivers/soundwire/mipi_disco.c b/drivers/soundwire/mipi_disco.c index 4ae62b452b8c..dbd8fc6f4dad 100644 --- a/drivers/soundwire/mipi_disco.c +++ b/drivers/soundwire/mipi_disco.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) // Copyright(c) 2015-17 Intel Corporation.
/* diff --git a/drivers/soundwire/slave.c b/drivers/soundwire/slave.c index 0839445ee07b..8e8b62dff51c 100644 --- a/drivers/soundwire/slave.c +++ b/drivers/soundwire/slave.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) // Copyright(c) 2015-17 Intel Corporation.
#include <linux/acpi.h> diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c index a9a72574b34a..296cea48bdcc 100644 --- a/drivers/soundwire/stream.c +++ b/drivers/soundwire/stream.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) // Copyright(c) 2015-18 Intel Corporation.
/* diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h index 9c27a32df9bb..1fde044f5f3e 100644 --- a/include/linux/soundwire/sdw.h +++ b/include/linux/soundwire/sdw.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */ /* Copyright(c) 2015-17 Intel Corporation. */
#ifndef __SOUNDWIRE_H diff --git a/include/linux/soundwire/sdw_intel.h b/include/linux/soundwire/sdw_intel.h index 979b41b5dcb4..96a8633339a1 100644 --- a/include/linux/soundwire/sdw_intel.h +++ b/include/linux/soundwire/sdw_intel.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */ /* Copyright(c) 2015-17 Intel Corporation. */
#ifndef __SDW_INTEL_H diff --git a/include/linux/soundwire/sdw_registers.h b/include/linux/soundwire/sdw_registers.h index a686f7988156..06d895168b32 100644 --- a/include/linux/soundwire/sdw_registers.h +++ b/include/linux/soundwire/sdw_registers.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */ /* Copyright(c) 2015-17 Intel Corporation. */
#ifndef __SDW_REGISTERS_H diff --git a/include/linux/soundwire/sdw_type.h b/include/linux/soundwire/sdw_type.h index 52eb66cd11bc..25ab91f5c6be 100644 --- a/include/linux/soundwire/sdw_type.h +++ b/include/linux/soundwire/sdw_type.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* Copyright(c) 2015-17 Intel Corporation. */
#ifndef __SOUNDWIRE_TYPES_H
On Mon, Jun 01, 2020 at 01:28:07AM +0800, Bard Liao wrote:
From: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com
Change SPDX from GPL-2.0 to GPL-2.0-only for Intel-contributed code. This was explicit before the transition to SPDX and lost in translation.
It is also explicit in the "GPL-2.0" lines as well, did you read the LICENSES/preferred/GPL-2.0 file for the allowed tags to be used for this license?
So this doesn't change anything, and we are trying to cut down on this type of churn until, maybe, after the whole kernel has proper SPDX lines.
thanks,
greg k-h
On 6/1/20 12:38 AM, Greg KH wrote:
On Mon, Jun 01, 2020 at 01:28:07AM +0800, Bard Liao wrote:
From: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com
Change SPDX from GPL-2.0 to GPL-2.0-only for Intel-contributed code. This was explicit before the transition to SPDX and lost in translation.
It is also explicit in the "GPL-2.0" lines as well, did you read the LICENSES/preferred/GPL-2.0 file for the allowed tags to be used for this license?
So this doesn't change anything, and we are trying to cut down on this type of churn until, maybe, after the whole kernel has proper SPDX lines.
My commit message was misleading, sorry. For SoundWire, we recently added new files with GPL-2.0-only (master + sysfs), as recommended since the short GPL-2.0 identifier is deprecated (https://spdx.org/licenses/GPL-2.0.html https://spdx.org/licenses/).
Intel does not mind if we delay this change, you are right that this doesn't change anything license-wise. I just felt it was a good time to align old and new contributions to avoid having half of the files with GPL-2.0 and half with GPL-2.0-only.
We still have quite a few patches for SoundWire (~80 coming w/ 7k lines changed), so those changes are really minimal in comparison with the actual 'churn' to fix programming sequences, power management, multi-link management and bit allocation.
Oh and this was not intended to be added to 5.8 btw or pulled as a fix, really nothing to do with the merge window.
If you prefer us to keep this change on the back burner, that's fine, the only intent was to keep all SoundWire-related files consistent.
On Mon, Jun 01, 2020 at 03:50:13PM -0500, Pierre-Louis Bossart wrote:
On 6/1/20 12:38 AM, Greg KH wrote:
On Mon, Jun 01, 2020 at 01:28:07AM +0800, Bard Liao wrote:
From: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com
Change SPDX from GPL-2.0 to GPL-2.0-only for Intel-contributed code. This was explicit before the transition to SPDX and lost in translation.
It is also explicit in the "GPL-2.0" lines as well, did you read the LICENSES/preferred/GPL-2.0 file for the allowed tags to be used for this license?
So this doesn't change anything, and we are trying to cut down on this type of churn until, maybe, after the whole kernel has proper SPDX lines.
My commit message was misleading, sorry. For SoundWire, we recently added new files with GPL-2.0-only (master + sysfs), as recommended since the short GPL-2.0 identifier is deprecated (https://spdx.org/licenses/GPL-2.0.html https://spdx.org/licenses/).
Again, that is the SPDX new list, of course they want to depreciate older versions. But we started the kernel conversion _before_ the newer version was there, let's not worry about changing anything at this point in time as that is unneeded churn.
For new files, fine, pick which ever tag you want to use as documented in the LICENSES/* files, but do not change existing ones please.
thanks,
greg k-h
participants (3)
-
Bard Liao -
Greg KH -
Pierre-Louis Bossart