From: Greg Kroah-Hartman Date: Wed, 7 Feb 2018 20:07:29 +0000 (-0800) Subject: 4.15-stable patches X-Git-Tag: v4.15.3~16 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=61a21cdc0c0db594a206aacf8abd81b697d2113b;p=thirdparty%2Fkernel%2Fstable-queue.git 4.15-stable patches added patches: gpio-uniphier-fix-mismatch-between-license-text-and-module_license.patch media-mtk-vcodec-add-missing-module_license-description.patch media-soc_camera-soc_scale_crop-add-missing-module_description-author-license.patch media-tegra-cec-add-missing-module_description-author-license.patch --- diff --git a/queue-4.15/gpio-uniphier-fix-mismatch-between-license-text-and-module_license.patch b/queue-4.15/gpio-uniphier-fix-mismatch-between-license-text-and-module_license.patch new file mode 100644 index 00000000000..4c0a612ef13 --- /dev/null +++ b/queue-4.15/gpio-uniphier-fix-mismatch-between-license-text-and-module_license.patch @@ -0,0 +1,35 @@ +From 13f9d59cef91a027bb338fc79b564fafa7680cd8 Mon Sep 17 00:00:00 2001 +From: Masahiro Yamada +Date: Thu, 23 Nov 2017 19:01:49 +0900 +Subject: gpio: uniphier: fix mismatch between license text and MODULE_LICENSE + +From: Masahiro Yamada + +commit 13f9d59cef91a027bb338fc79b564fafa7680cd8 upstream. + +The comment block of this file indicates GPL-2.0 "only", while the +MODULE_LICENSE is GPL-2.0 "or later", as include/linux/module.h +describes as follows: + + "GPL" [GNU Public License v2 or later] + "GPL v2" [GNU Public License v2] + +I am the author of this driver, and my intention is GPL-2.0 "only". + +Fixes: dbe776c2ca54 ("gpio: uniphier: add UniPhier GPIO controller driver") +Signed-off-by: Masahiro Yamada +Signed-off-by: Linus Walleij +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpio/gpio-uniphier.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpio/gpio-uniphier.c ++++ b/drivers/gpio/gpio-uniphier.c +@@ -505,4 +505,4 @@ module_platform_driver(uniphier_gpio_dri + + MODULE_AUTHOR("Masahiro Yamada "); + MODULE_DESCRIPTION("UniPhier GPIO driver"); +-MODULE_LICENSE("GPL"); ++MODULE_LICENSE("GPL v2"); diff --git a/queue-4.15/media-mtk-vcodec-add-missing-module_license-description.patch b/queue-4.15/media-mtk-vcodec-add-missing-module_license-description.patch new file mode 100644 index 00000000000..c817957a670 --- /dev/null +++ b/queue-4.15/media-mtk-vcodec-add-missing-module_license-description.patch @@ -0,0 +1,37 @@ +From ccbc1e3876d5476fc23429690a683294ef0f755b Mon Sep 17 00:00:00 2001 +From: Jesse Chan +Date: Mon, 20 Nov 2017 02:47:54 -0500 +Subject: media: mtk-vcodec: add missing MODULE_LICENSE/DESCRIPTION + +From: Jesse Chan + +commit ccbc1e3876d5476fc23429690a683294ef0f755b upstream. + +This change resolves a new compile-time warning +when built as a loadable module: + +WARNING: modpost: missing MODULE_LICENSE() in drivers/media/platform/mtk-vcodec/mtk-vcodec-common.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 is also added. + +Signed-off-by: Jesse Chan +Signed-off-by: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c ++++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c +@@ -115,3 +115,6 @@ struct mtk_vcodec_ctx *mtk_vcodec_get_cu + return ctx; + } + EXPORT_SYMBOL(mtk_vcodec_get_curr_ctx); ++ ++MODULE_LICENSE("GPL v2"); ++MODULE_DESCRIPTION("Mediatek video codec driver"); diff --git a/queue-4.15/media-soc_camera-soc_scale_crop-add-missing-module_description-author-license.patch b/queue-4.15/media-soc_camera-soc_scale_crop-add-missing-module_description-author-license.patch new file mode 100644 index 00000000000..2c3a8d203e3 --- /dev/null +++ b/queue-4.15/media-soc_camera-soc_scale_crop-add-missing-module_description-author-license.patch @@ -0,0 +1,38 @@ +From 5331aec1bf9c9da557668174e0a4bfcee39f1121 Mon Sep 17 00:00:00 2001 +From: Jesse Chan +Date: Mon, 20 Nov 2017 15:56:28 -0500 +Subject: media: soc_camera: soc_scale_crop: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE + +From: Jesse Chan + +commit 5331aec1bf9c9da557668174e0a4bfcee39f1121 upstream. + +This change resolves a new compile-time warning +when built as a loadable module: + +WARNING: modpost: missing MODULE_LICENSE() in drivers/media/platform/soc_camera/soc_scale_crop.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: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/media/platform/soc_camera/soc_scale_crop.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/media/platform/soc_camera/soc_scale_crop.c ++++ b/drivers/media/platform/soc_camera/soc_scale_crop.c +@@ -420,3 +420,7 @@ void soc_camera_calc_client_output(struc + mf->height = soc_camera_shift_scale(rect->height, shift, scale_v); + } + EXPORT_SYMBOL(soc_camera_calc_client_output); ++ ++MODULE_DESCRIPTION("soc-camera scaling-cropping functions"); ++MODULE_AUTHOR("Guennadi Liakhovetski "); ++MODULE_LICENSE("GPL"); diff --git a/queue-4.15/media-tegra-cec-add-missing-module_description-author-license.patch b/queue-4.15/media-tegra-cec-add-missing-module_description-author-license.patch new file mode 100644 index 00000000000..2b178387953 --- /dev/null +++ b/queue-4.15/media-tegra-cec-add-missing-module_description-author-license.patch @@ -0,0 +1,39 @@ +From 20772c1a6f0e03d4231e2b539863987fa0c94e89 Mon Sep 17 00:00:00 2001 +From: Jesse Chan +Date: Mon, 20 Nov 2017 15:56:52 -0500 +Subject: media: tegra-cec: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE + +From: Jesse Chan + +commit 20772c1a6f0e03d4231e2b539863987fa0c94e89 upstream. + +This change resolves a new compile-time warning +when built as a loadable module: + +WARNING: modpost: missing MODULE_LICENSE() in drivers/media/platform/tegra-cec/tegra_cec.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: Hans Verkuil +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/media/platform/tegra-cec/tegra_cec.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/media/platform/tegra-cec/tegra_cec.c ++++ b/drivers/media/platform/tegra-cec/tegra_cec.c +@@ -493,3 +493,8 @@ static struct platform_driver tegra_cec_ + }; + + module_platform_driver(tegra_cec_driver); ++ ++MODULE_DESCRIPTION("Tegra HDMI CEC driver"); ++MODULE_AUTHOR("NVIDIA CORPORATION"); ++MODULE_AUTHOR("Cisco Systems, Inc. and/or its affiliates"); ++MODULE_LICENSE("GPL v2"); diff --git a/queue-4.15/series b/queue-4.15/series index bb059e13140..8bd80f1c795 100644 --- a/queue-4.15/series +++ b/queue-4.15/series @@ -16,3 +16,7 @@ ipv6-fix-so_reuseport-udp-socket-with-implicit-sk_ipv6only.patch soreuseport-fix-mem-leak-in-reuseport_add_sock.patch net_sched-get-rid-of-rcu_barrier-in-tcf_block_put_ext.patch net-sched-fix-use-after-free-in-tcf_block_put_ext.patch +media-mtk-vcodec-add-missing-module_license-description.patch +media-soc_camera-soc_scale_crop-add-missing-module_description-author-license.patch +media-tegra-cec-add-missing-module_description-author-license.patch +gpio-uniphier-fix-mismatch-between-license-text-and-module_license.patch