On Tue, Mar 20, 2018 at 10:01:28PM +0100, Daniel Scheller wrote:
> From: Daniel Scheller <d.scheller@xxxxxxx>
>
> Add SPDX license headers to the stv0910 and stv6111 DVB frontend
> drivers. Both drivers are licensed as GPL-2.0-only, so fix this in the
> MODULE_LICENSE while at it. Also, the includes were lacking any license
> headers at all, so add them now.
>
> Signed-off-by: Daniel Scheller <d.scheller@xxxxxxx>
> ---
> drivers/media/dvb-frontends/stv0910.c | 5 +++--
> drivers/media/dvb-frontends/stv0910.h | 9 +++++++++
> drivers/media/dvb-frontends/stv6111.c | 6 +++---
> drivers/media/dvb-frontends/stv6111.h | 7 +++++++
> 4 files changed, 22 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/media/dvb-frontends/stv0910.c b/drivers/media/dvb-frontends/stv0910.c
> index 52355c14fd64..ce82264e99ef 100644
> --- a/drivers/media/dvb-frontends/stv0910.c
> +++ b/drivers/media/dvb-frontends/stv0910.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-only
Please only use the identifiers documented in
Documentation/process/license-rules.rst right now. We wrote and got
that merged _before_ SPDX bumped the tags to 3.0 which added the (imo
crazy) -only variants.
So please stick with what is already in the kernel tree, if we do decide
to update to a newer version of SPDX, we will hit the tree all at once
with a script to give to Linus to run.
> /*
> * Driver for the ST STV0910 DVB-S/S2 demodulator.
> *
> @@ -11,7 +12,7 @@
> *
> * 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
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Why did you change this in this patch?
Please only do "one" thing per patch.
> * GNU General Public License for more details.
> */
>
> @@ -1836,4 +1837,4 @@ EXPORT_SYMBOL_GPL(stv0910_attach);
>
> MODULE_DESCRIPTION("ST STV0910 multistandard frontend driver");
> MODULE_AUTHOR("Ralph and Marcus Metzler, Manfred Voelkel");
> -MODULE_LICENSE("GPL");
> +MODULE_LICENSE("GPL v2");
Again, this should be a separate patch.
> diff --git a/drivers/media/dvb-frontends/stv0910.h b/drivers/media/dvb-frontends/stv0910.h
> index fccd8d9b665f..93de08540ce4 100644
> --- a/drivers/media/dvb-frontends/stv0910.h
> +++ b/drivers/media/dvb-frontends/stv0910.h
> @@ -1,3 +1,12 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> +/*
> + * Driver for the ST STV0910 DVB-S/S2 demodulator.
> + *
> + * Copyright (C) 2014-2015 Ralph Metzler <rjkm@xxxxxxxxxxxxxx>
> + * Marcus Metzler <mocm@xxxxxxxxxxxxxx>
> + * developed for Digital Devices GmbH
> + */
Where did that copyright notice come from?
This patch is a total mix of different things, please do not do that at
all!
thanks,
greg k-h
