| Message ID | 20230510092534.3919120-1-ckeepax@opensource.cirrus.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f9f46d05003ea6120fa27e01628770a2dac0fa75 |
| Headers | show |
| Series | ASoC: cs35l45: Relicense to GPL only | expand |
On 10/05/2023 10:25, Charles Keepax wrote: > Cirrus never intended to upstream dual licensed code, convert to > GPL only. > > Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> > --- > > Apologies for this but this was never our intention and I believe that > it can be a little legally involved maintaining dual licensed kernel code. > Fortunately not that many people outside of Cirrus have contributed to > the files in question. I have CCed everyone who has contributed both > internally and externally. > > Thanks, > Charles > > sound/soc/codecs/cs35l45-i2c.c | 4 ++-- > sound/soc/codecs/cs35l45-spi.c | 4 ++-- > sound/soc/codecs/cs35l45-tables.c | 2 +- > sound/soc/codecs/cs35l45.c | 4 ++-- > sound/soc/codecs/cs35l45.h | 2 +- > 5 files changed, 8 insertions(+), 8 deletions(-) > Reviewed-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Reviewed-by: Vlad Karpovich <vkarpovi@opensource.cirrus.com> On 5/10/23 04:25, Charles Keepax wrote: > Cirrus never intended to upstream dual licensed code, convert to > GPL only. > > Signed-off-by: Charles Keepax<ckeepax@opensource.cirrus.com> > --- > > Apologies for this but this was never our intention and I believe that > it can be a little legally involved maintaining dual licensed kernel code. > Fortunately not that many people outside of Cirrus have contributed to > the files in question. I have CCed everyone who has contributed both > internally and externally. > > Thanks, > Charles > > sound/soc/codecs/cs35l45-i2c.c | 4 ++-- > sound/soc/codecs/cs35l45-spi.c | 4 ++-- > sound/soc/codecs/cs35l45-tables.c | 2 +- > sound/soc/codecs/cs35l45.c | 4 ++-- > sound/soc/codecs/cs35l45.h | 2 +- > 5 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/sound/soc/codecs/cs35l45-i2c.c b/sound/soc/codecs/cs35l45-i2c.c > index 5832ebb90c2b9..77e0f8750f375 100644 > --- a/sound/soc/codecs/cs35l45-i2c.c > +++ b/sound/soc/codecs/cs35l45-i2c.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > +// SPDX-License-Identifier: GPL-2.0 > // > // cs35l45-i2c.c -- CS35L45 I2C driver > // > @@ -72,5 +72,5 @@ module_i2c_driver(cs35l45_i2c_driver); > > MODULE_DESCRIPTION("I2C CS35L45 driver"); > MODULE_AUTHOR("James Schulman, Cirrus Logic Inc,<james.schulman@cirrus.com>"); > -MODULE_LICENSE("Dual BSD/GPL"); > +MODULE_LICENSE("GPL"); > MODULE_IMPORT_NS(SND_SOC_CS35L45); > diff --git a/sound/soc/codecs/cs35l45-spi.c b/sound/soc/codecs/cs35l45-spi.c > index a00b23b4180c5..5efb77530cc33 100644 > --- a/sound/soc/codecs/cs35l45-spi.c > +++ b/sound/soc/codecs/cs35l45-spi.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > +// SPDX-License-Identifier: GPL-2.0 > // > // cs35l45-spi.c -- CS35L45 SPI driver > // > @@ -74,5 +74,5 @@ module_spi_driver(cs35l45_spi_driver); > > MODULE_DESCRIPTION("SPI CS35L45 driver"); > MODULE_AUTHOR("James Schulman, Cirrus Logic Inc,<james.schulman@cirrus.com>"); > -MODULE_LICENSE("Dual BSD/GPL"); > +MODULE_LICENSE("GPL"); > MODULE_IMPORT_NS(SND_SOC_CS35L45); > diff --git a/sound/soc/codecs/cs35l45-tables.c b/sound/soc/codecs/cs35l45-tables.c > index 46610e64e8188..066f83c0c7ac2 100644 > --- a/sound/soc/codecs/cs35l45-tables.c > +++ b/sound/soc/codecs/cs35l45-tables.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > +// SPDX-License-Identifier: GPL-2.0 > // > // cs35l45-tables.c -- CS35L45 ALSA SoC audio driver > // > diff --git a/sound/soc/codecs/cs35l45.c b/sound/soc/codecs/cs35l45.c > index c31597f6bfae1..d1edb9876c10f 100644 > --- a/sound/soc/codecs/cs35l45.c > +++ b/sound/soc/codecs/cs35l45.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause > +// SPDX-License-Identifier: GPL-2.0 > // > // cs35l45.c - CS35L45 ALSA SoC audio driver > // > @@ -1296,4 +1296,4 @@ EXPORT_SYMBOL_NS_GPL(cs35l45_pm_ops, SND_SOC_CS35L45); > MODULE_DESCRIPTION("ASoC CS35L45 driver"); > MODULE_AUTHOR("James Schulman, Cirrus Logic Inc,<james.schulman@cirrus.com>"); > MODULE_AUTHOR("Richard Fitzgerald<rf@opensource.cirrus.com>"); > -MODULE_LICENSE("Dual BSD/GPL"); > +MODULE_LICENSE("GPL"); > diff --git a/sound/soc/codecs/cs35l45.h b/sound/soc/codecs/cs35l45.h > index 0da28439f628b..61135a316df33 100644 > --- a/sound/soc/codecs/cs35l45.h > +++ b/sound/soc/codecs/cs35l45.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ > +/* SPDX-License-Identifier: GPL-2.0 */ > /* > * cs35l45.h - CS35L45 ALSA SoC audio driver > *
On Wed, May 10, 2023 at 10:25:34AM +0100, Charles Keepax wrote: > Cirrus never intended to upstream dual licensed code, convert to > GPL only. > > Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> > --- > > Apologies for this but this was never our intention and I believe that > it can be a little legally involved maintaining dual licensed kernel code. > Fortunately not that many people outside of Cirrus have contributed to > the files in question. I have CCed everyone who has contributed both > internally and externally. Pierre, Uwe, Apologies for chasing but it would be really helpful to get an ack for this one, we need the approval of everyone who contributed to fix the licensing issue. Thanks, Charles
Hello Charles, On Wed, May 24, 2023 at 09:05:56AM +0000, Charles Keepax wrote: > On Wed, May 10, 2023 at 10:25:34AM +0100, Charles Keepax wrote: > > Cirrus never intended to upstream dual licensed code, convert to > > GPL only. > > > > Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> > > --- > > > > Apologies for this but this was never our intention and I believe that > > it can be a little legally involved maintaining dual licensed kernel code. > > Fortunately not that many people outside of Cirrus have contributed to > > the files in question. I have CCed everyone who has contributed both > > internally and externally. > > Pierre, Uwe, > > Apologies for chasing but it would be really helpful to get an > ack for this one, we need the approval of everyone who > contributed to fix the licensing issue. I'd say removing a license option isn't so critical; and my contribution probably isn't relevant for the copyright, but INAL and for avoidance of doubt: Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Best regards Uwe
On 5/24/23 04:05, Charles Keepax wrote: > On Wed, May 10, 2023 at 10:25:34AM +0100, Charles Keepax wrote: >> Cirrus never intended to upstream dual licensed code, convert to >> GPL only. >> >> Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> >> --- >> >> Apologies for this but this was never our intention and I believe that >> it can be a little legally involved maintaining dual licensed kernel code. >> Fortunately not that many people outside of Cirrus have contributed to >> the files in question. I have CCed everyone who has contributed both >> internally and externally. > > Pierre, Uwe, > > Apologies for chasing but it would be really helpful to get an > ack for this one, we need the approval of everyone who > contributed to fix the licensing issue. Sorry, I missed that you were asking me... My only contribution is a two-character change in a header file to make cppcheck happy. -int cs35l45_apply_patch(struct cs35l45_private *cs43l45); +int cs35l45_apply_patch(struct cs35l45_private *cs35l45); I double-checked with Intel legal to be sure, and there's no issue with removing the BSD3 license. Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
On Wed, 10 May 2023 10:25:34 +0100, Charles Keepax wrote: > Cirrus never intended to upstream dual licensed code, convert to > GPL only. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: cs35l45: Relicense to GPL only commit: f9f46d05003ea6120fa27e01628770a2dac0fa75 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/codecs/cs35l45-i2c.c b/sound/soc/codecs/cs35l45-i2c.c index 5832ebb90c2b9..77e0f8750f375 100644 --- a/sound/soc/codecs/cs35l45-i2c.c +++ b/sound/soc/codecs/cs35l45-i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0 // // cs35l45-i2c.c -- CS35L45 I2C driver // @@ -72,5 +72,5 @@ module_i2c_driver(cs35l45_i2c_driver); MODULE_DESCRIPTION("I2C CS35L45 driver"); MODULE_AUTHOR("James Schulman, Cirrus Logic Inc, <james.schulman@cirrus.com>"); -MODULE_LICENSE("Dual BSD/GPL"); +MODULE_LICENSE("GPL"); MODULE_IMPORT_NS(SND_SOC_CS35L45); diff --git a/sound/soc/codecs/cs35l45-spi.c b/sound/soc/codecs/cs35l45-spi.c index a00b23b4180c5..5efb77530cc33 100644 --- a/sound/soc/codecs/cs35l45-spi.c +++ b/sound/soc/codecs/cs35l45-spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0 // // cs35l45-spi.c -- CS35L45 SPI driver // @@ -74,5 +74,5 @@ module_spi_driver(cs35l45_spi_driver); MODULE_DESCRIPTION("SPI CS35L45 driver"); MODULE_AUTHOR("James Schulman, Cirrus Logic Inc, <james.schulman@cirrus.com>"); -MODULE_LICENSE("Dual BSD/GPL"); +MODULE_LICENSE("GPL"); MODULE_IMPORT_NS(SND_SOC_CS35L45); diff --git a/sound/soc/codecs/cs35l45-tables.c b/sound/soc/codecs/cs35l45-tables.c index 46610e64e8188..066f83c0c7ac2 100644 --- a/sound/soc/codecs/cs35l45-tables.c +++ b/sound/soc/codecs/cs35l45-tables.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0 // // cs35l45-tables.c -- CS35L45 ALSA SoC audio driver // diff --git a/sound/soc/codecs/cs35l45.c b/sound/soc/codecs/cs35l45.c index c31597f6bfae1..d1edb9876c10f 100644 --- a/sound/soc/codecs/cs35l45.c +++ b/sound/soc/codecs/cs35l45.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0 // // cs35l45.c - CS35L45 ALSA SoC audio driver // @@ -1296,4 +1296,4 @@ EXPORT_SYMBOL_NS_GPL(cs35l45_pm_ops, SND_SOC_CS35L45); MODULE_DESCRIPTION("ASoC CS35L45 driver"); MODULE_AUTHOR("James Schulman, Cirrus Logic Inc, <james.schulman@cirrus.com>"); MODULE_AUTHOR("Richard Fitzgerald <rf@opensource.cirrus.com>"); -MODULE_LICENSE("Dual BSD/GPL"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/cs35l45.h b/sound/soc/codecs/cs35l45.h index 0da28439f628b..61135a316df33 100644 --- a/sound/soc/codecs/cs35l45.h +++ b/sound/soc/codecs/cs35l45.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0 */ /* * cs35l45.h - CS35L45 ALSA SoC audio driver *
Cirrus never intended to upstream dual licensed code, convert to GPL only. Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> --- Apologies for this but this was never our intention and I believe that it can be a little legally involved maintaining dual licensed kernel code. Fortunately not that many people outside of Cirrus have contributed to the files in question. I have CCed everyone who has contributed both internally and externally. Thanks, Charles sound/soc/codecs/cs35l45-i2c.c | 4 ++-- sound/soc/codecs/cs35l45-spi.c | 4 ++-- sound/soc/codecs/cs35l45-tables.c | 2 +- sound/soc/codecs/cs35l45.c | 4 ++-- sound/soc/codecs/cs35l45.h | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-)