From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 7 Feb 2018 20:07:27 +0000 (-0800)
Subject: 4.14-stable patches
X-Git-Tag: v4.15.3~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=220d1ff00a10960ebccc398c42a9cc5a94d6e0a3;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	media-mtk-vcodec-add-missing-module_license-description.patch
	media-soc_camera-soc_scale_crop-add-missing-module_description-author-license.patch
---

diff --git a/queue-4.14/media-mtk-vcodec-add-missing-module_license-description.patch b/queue-4.14/media-mtk-vcodec-add-missing-module_license-description.patch
new file mode 100644
index 00000000000..c817957a670
--- /dev/null
+++ b/queue-4.14/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 <jc@linux.com>
+Date: Mon, 20 Nov 2017 02:47:54 -0500
+Subject: media: mtk-vcodec: add missing MODULE_LICENSE/DESCRIPTION
+
+From: Jesse Chan <jc@linux.com>
+
+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 <jc@linux.com>
+Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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.14/media-soc_camera-soc_scale_crop-add-missing-module_description-author-license.patch b/queue-4.14/media-soc_camera-soc_scale_crop-add-missing-module_description-author-license.patch
new file mode 100644
index 00000000000..daf1eb2a685
--- /dev/null
+++ b/queue-4.14/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 <jc@linux.com>
+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 <jc@linux.com>
+
+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 <jc@linux.com>
+Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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
+@@ -419,3 +419,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 <kernel@pengutronix.de>");
++MODULE_LICENSE("GPL");
diff --git a/queue-4.14/series b/queue-4.14/series
index 0aece8b7cc3..9857e1318a7 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -14,3 +14,5 @@ rocker-fix-possible-null-pointer-dereference-in-rocker_router_fib_event_work.pat
 tcp_bbr-fix-pacing_gain-to-always-be-unity-when-using-lt_bw.patch
 ipv6-fix-so_reuseport-udp-socket-with-implicit-sk_ipv6only.patch
 soreuseport-fix-mem-leak-in-reuseport_add_sock.patch
+media-mtk-vcodec-add-missing-module_license-description.patch
+media-soc_camera-soc_scale_crop-add-missing-module_description-author-license.patch