From: Greg Kroah-Hartman Date: Sun, 4 Feb 2018 13:09:14 +0000 (+0100) Subject: 4.15-stable patches X-Git-Tag: v3.18.94~19 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b673d831a8c2c8a57ca175bde03bc0753efcd0cc;p=thirdparty%2Fkernel%2Fstable-queue.git 4.15-stable patches added patches: asoc-pcm512x-add-missing-module_description-author-license.patch auxdisplay-img-ascii-lcd-add-missing-module_description-author-license.patch iio-adc-accel-fix-up-module-licenses.patch pinctrl-pxa-pxa2xx-add-missing-module_description-author-license.patch --- diff --git a/queue-4.15/asoc-pcm512x-add-missing-module_description-author-license.patch b/queue-4.15/asoc-pcm512x-add-missing-module_description-author-license.patch new file mode 100644 index 00000000000..27b23806b96 --- /dev/null +++ b/queue-4.15/asoc-pcm512x-add-missing-module_description-author-license.patch @@ -0,0 +1,37 @@ +From 0cab20cec0b663b7be8e2be5998d5a4113647f86 Mon Sep 17 00:00:00 2001 +From: Jesse Chan +Date: Sun, 19 Nov 2017 23:45:49 -0800 +Subject: ASoC: pcm512x: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE + +From: Jesse Chan + +commit 0cab20cec0b663b7be8e2be5998d5a4113647f86 upstream. + +This change resolves a new compile-time warning +when built as a loadable module: + +WARNING: modpost: missing MODULE_LICENSE() in sound/soc/codecs/snd-soc-pcm512x-spi.o +see include/linux/module.h for more information + +This adds the license as "GPL v2", which matches the header of the file. + +MODULE_DESCRIPTION and MODULE_AUTHOR are also added. + +Signed-off-by: Jesse Chan +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman + +--- + sound/soc/codecs/pcm512x-spi.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/sound/soc/codecs/pcm512x-spi.c ++++ b/sound/soc/codecs/pcm512x-spi.c +@@ -70,3 +70,7 @@ static struct spi_driver pcm512x_spi_dri + }; + + module_spi_driver(pcm512x_spi_driver); ++ ++MODULE_DESCRIPTION("ASoC PCM512x codec driver - SPI"); ++MODULE_AUTHOR("Mark Brown "); ++MODULE_LICENSE("GPL v2"); diff --git a/queue-4.15/auxdisplay-img-ascii-lcd-add-missing-module_description-author-license.patch b/queue-4.15/auxdisplay-img-ascii-lcd-add-missing-module_description-author-license.patch new file mode 100644 index 00000000000..780cc6515da --- /dev/null +++ b/queue-4.15/auxdisplay-img-ascii-lcd-add-missing-module_description-author-license.patch @@ -0,0 +1,37 @@ +From 09c479f7f1fbfaf848e5813996793966cd50be81 Mon Sep 17 00:00:00 2001 +From: Jesse Chan +Date: Wed, 10 Jan 2018 17:41:10 +0100 +Subject: auxdisplay: img-ascii-lcd: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE + +From: Jesse Chan + +commit 09c479f7f1fbfaf848e5813996793966cd50be81 upstream. + +This change resolves a new compile-time warning +when built as a loadable module: + +WARNING: modpost: missing MODULE_LICENSE() in drivers/auxdisplay/img-ascii-lcd.o +see include/linux/module.h for more information + +This adds the license as "GPL", which matches the header of the file. + +MODULE_DESCRIPTION and MODULE_AUTHOR are also added. + +Signed-off-by: Jesse Chan +Signed-off-by: Arnd Bergmann +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/auxdisplay/img-ascii-lcd.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/auxdisplay/img-ascii-lcd.c ++++ b/drivers/auxdisplay/img-ascii-lcd.c +@@ -441,3 +441,7 @@ static struct platform_driver img_ascii_ + .remove = img_ascii_lcd_remove, + }; + module_platform_driver(img_ascii_lcd_driver); ++ ++MODULE_DESCRIPTION("Imagination Technologies ASCII LCD Display"); ++MODULE_AUTHOR("Paul Burton "); ++MODULE_LICENSE("GPL"); diff --git a/queue-4.15/iio-adc-accel-fix-up-module-licenses.patch b/queue-4.15/iio-adc-accel-fix-up-module-licenses.patch new file mode 100644 index 00000000000..3077019c95e --- /dev/null +++ b/queue-4.15/iio-adc-accel-fix-up-module-licenses.patch @@ -0,0 +1,50 @@ +From 9a0ebbc93547d88f422905c34dcceebe928f3e9e Mon Sep 17 00:00:00 2001 +From: Linus Walleij +Date: Mon, 13 Nov 2017 11:29:55 +0100 +Subject: iio: adc/accel: Fix up module licenses + +From: Linus Walleij + +commit 9a0ebbc93547d88f422905c34dcceebe928f3e9e upstream. + +The module license checker complains about these two so just fix +it up. They are both GPLv2, both written by me or using code +I extracted while refactoring from the GPLv2 drivers. + +Cc: Randy Dunlap +Reported-by: Randy Dunlap +Signed-off-by: Linus Walleij +Signed-off-by: Jonathan Cameron +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/iio/accel/kxsd9-i2c.c | 3 +++ + drivers/iio/adc/qcom-vadc-common.c | 4 ++++ + 2 files changed, 7 insertions(+) + +--- a/drivers/iio/accel/kxsd9-i2c.c ++++ b/drivers/iio/accel/kxsd9-i2c.c +@@ -63,3 +63,6 @@ static struct i2c_driver kxsd9_i2c_drive + .id_table = kxsd9_i2c_id, + }; + module_i2c_driver(kxsd9_i2c_driver); ++ ++MODULE_LICENSE("GPL v2"); ++MODULE_DESCRIPTION("KXSD9 accelerometer I2C interface"); +--- a/drivers/iio/adc/qcom-vadc-common.c ++++ b/drivers/iio/adc/qcom-vadc-common.c +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + + #include "qcom-vadc-common.h" + +@@ -229,3 +230,6 @@ int qcom_vadc_decimation_from_dt(u32 val + return __ffs64(value / VADC_DECIMATION_MIN); + } + EXPORT_SYMBOL(qcom_vadc_decimation_from_dt); ++ ++MODULE_LICENSE("GPL v2"); ++MODULE_DESCRIPTION("Qualcomm ADC common functionality"); diff --git a/queue-4.15/pinctrl-pxa-pxa2xx-add-missing-module_description-author-license.patch b/queue-4.15/pinctrl-pxa-pxa2xx-add-missing-module_description-author-license.patch new file mode 100644 index 00000000000..49780eaf9d7 --- /dev/null +++ b/queue-4.15/pinctrl-pxa-pxa2xx-add-missing-module_description-author-license.patch @@ -0,0 +1,37 @@ +From 0b9335cbd38e3bd2025bcc23b5758df4ac035f75 Mon Sep 17 00:00:00 2001 +From: Jesse Chan +Date: Mon, 20 Nov 2017 12:58:03 -0800 +Subject: pinctrl: pxa: pxa2xx: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE + +From: Jesse Chan + +commit 0b9335cbd38e3bd2025bcc23b5758df4ac035f75 upstream. + +This change resolves a new compile-time warning +when built as a loadable module: + +WARNING: modpost: missing MODULE_LICENSE() in drivers/pinctrl/pxa/pinctrl-pxa2xx.o +see include/linux/module.h for more information + +This adds the license as "GPL v2", which matches the header of the file. + +MODULE_DESCRIPTION and MODULE_AUTHOR are also added. + +Signed-off-by: Jesse Chan +Signed-off-by: Linus Walleij +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/pinctrl/pxa/pinctrl-pxa2xx.c ++++ b/drivers/pinctrl/pxa/pinctrl-pxa2xx.c +@@ -436,3 +436,7 @@ int pxa2xx_pinctrl_exit(struct platform_ + return 0; + } + EXPORT_SYMBOL_GPL(pxa2xx_pinctrl_exit); ++ ++MODULE_AUTHOR("Robert Jarzmik "); ++MODULE_DESCRIPTION("Marvell PXA2xx pinctrl driver"); ++MODULE_LICENSE("GPL v2"); diff --git a/queue-4.15/series b/queue-4.15/series index 837e2fb48fe..9cbe07d0174 100644 --- a/queue-4.15/series +++ b/queue-4.15/series @@ -16,3 +16,7 @@ x86cpubugs_Make_retpoline_module_warning_conditional.patch x86cpufeatures_Clean_up_Spectre_v2_related_CPUID_flags.patch x86retpoline_Simplify_vmexit_fill_RSB().patch x86speculation_Simplify_indirect_branch_prediction_barrier().patch +auxdisplay-img-ascii-lcd-add-missing-module_description-author-license.patch +iio-adc-accel-fix-up-module-licenses.patch +pinctrl-pxa-pxa2xx-add-missing-module_description-author-license.patch +asoc-pcm512x-add-missing-module_description-author-license.patch