3.18-stable patches

added patches:
	asoc-ux500-add-module_license-tag.patch
	video-fbdev-mmp-add-module_license.patch

diff --git a/queue-3.18/asoc-ux500-add-module_license-tag.patch b/queue-3.18/asoc-ux500-add-module_license-tag.patch
new file mode 100644 (file)
index 0000000..3a4310b
--- /dev/null
+++ b/queue-3.18/asoc-ux500-add-module_license-tag.patch
@@ -0,0 +1,48 @@
+From 1783c9d7cb7bc3181b9271665959b87280d98d8e Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Wed, 10 Jan 2018 17:34:45 +0100
+Subject: ASoC: ux500: add MODULE_LICENSE tag
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit 1783c9d7cb7bc3181b9271665959b87280d98d8e upstream.
+
+This adds MODULE_LICENSE/AUTHOR/DESCRIPTION tags to the ux500
+platform drivers, to avoid these build warnings:
+
+WARNING: modpost: missing MODULE_LICENSE() in sound/soc/ux500/snd-soc-ux500-plat-dma.o
+WARNING: modpost: missing MODULE_LICENSE() in sound/soc/ux500/snd-soc-ux500-mach-mop500.o
+
+The company no longer exists, so the email addresses of the authors
+don't work any more, but I've added them anyway for consistency.
+
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/soc/ux500/mop500.c    |    4 ++++
+ sound/soc/ux500/ux500_pcm.c |    5 +++++
+ 2 files changed, 9 insertions(+)
+
+--- a/sound/soc/ux500/mop500.c
++++ b/sound/soc/ux500/mop500.c
+@@ -168,3 +168,7 @@ static struct platform_driver snd_soc_mo
+ };
+ 
+ module_platform_driver(snd_soc_mop500_driver);
++
++MODULE_LICENSE("GPL v2");
++MODULE_DESCRIPTION("ASoC MOP500 board driver");
++MODULE_AUTHOR("Ola Lilja");
+--- a/sound/soc/ux500/ux500_pcm.c
++++ b/sound/soc/ux500/ux500_pcm.c
+@@ -166,3 +166,8 @@ int ux500_pcm_unregister_platform(struct
+       return 0;
+ }
+ EXPORT_SYMBOL_GPL(ux500_pcm_unregister_platform);
++
++MODULE_AUTHOR("Ola Lilja");
++MODULE_AUTHOR("Roger Nilsson");
++MODULE_DESCRIPTION("ASoC UX500 driver");
++MODULE_LICENSE("GPL v2");

diff --git a/queue-3.18/series b/queue-3.18/series
index a691e3f8e28c2294e81d3d538cf03d6f724b70bf..82257968c234c388d075f211c8ed674e9cc9fdce 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -28,3 +28,5 @@ netfilter-xt_rateest-acquire-xt_rateest_mutex-for-hash-insert.patch
 net-avoid-skb_warn_bad_offload-on-is_err.patch
 provide-a-function-to-create-a-nul-terminated-string-from-unterminated-data.patch
 selinux-ensure-the-context-is-nul-terminated-in-security_context_to_sid_core.patch
+asoc-ux500-add-module_license-tag.patch
+video-fbdev-mmp-add-module_license.patch

diff --git a/queue-3.18/video-fbdev-mmp-add-module_license.patch b/queue-3.18/video-fbdev-mmp-add-module_license.patch
new file mode 100644 (file)
index 0000000..e24cfa8
--- /dev/null
+++ b/queue-3.18/video-fbdev-mmp-add-module_license.patch
@@ -0,0 +1,41 @@
+From c1530ac5a3ce93a1f02adabc4508b5fbf862dfe2 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Mon, 15 Jan 2018 17:04:22 +0100
+Subject: video: fbdev/mmp: add MODULE_LICENSE
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit c1530ac5a3ce93a1f02adabc4508b5fbf862dfe2 upstream.
+
+Kbuild complains about the lack of a license tag in this driver:
+
+WARNING: modpost: missing MODULE_LICENSE() in drivers/video/fbdev/mmp/mmp_disp.o
+
+This adds the license, author and description tags.
+
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/video/fbdev/mmp/core.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/drivers/video/fbdev/mmp/core.c
++++ b/drivers/video/fbdev/mmp/core.c
+@@ -23,6 +23,7 @@
+ #include <linux/slab.h>
+ #include <linux/dma-mapping.h>
+ #include <linux/export.h>
++#include <linux/module.h>
+ #include <video/mmp_disp.h>
+ 
+ static struct mmp_overlay *path_get_overlay(struct mmp_path *path,
+@@ -249,3 +250,7 @@ void mmp_unregister_path(struct mmp_path
+       mutex_unlock(&disp_lock);
+ }
+ EXPORT_SYMBOL_GPL(mmp_unregister_path);
++
++MODULE_AUTHOR("Zhou Zhu <zzhu3@marvell.com>");
++MODULE_DESCRIPTION("Marvell MMP display framework");
++MODULE_LICENSE("GPL");