From: Greg Kroah-Hartman Date: Fri, 23 Feb 2018 07:45:25 +0000 (+0100) Subject: 4.15-stable patches X-Git-Tag: v3.18.96~33 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b96eb22f273b6aae1749ba737739959cfebf92d;p=thirdparty%2Fkernel%2Fstable-queue.git 4.15-stable patches added patches: arm-8743-1-bl_switcher-add-module_license-tag.patch arm64-dts-add-cooling-cells-to-cpu-nodes.patch asoc-ux500-add-module_license-tag.patch soc-qcom-rmtfs_mem-add-missing-module_description-author-license.patch video-fbdev-mmp-add-module_license.patch --- diff --git a/queue-4.15/arm-8743-1-bl_switcher-add-module_license-tag.patch b/queue-4.15/arm-8743-1-bl_switcher-add-module_license-tag.patch new file mode 100644 index 00000000000..b045774c034 --- /dev/null +++ b/queue-4.15/arm-8743-1-bl_switcher-add-module_license-tag.patch @@ -0,0 +1,33 @@ +From a21b4c10c7bf5b58112afa20d6fa829e8d74e3e6 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Wed, 10 Jan 2018 17:53:18 +0100 +Subject: ARM: 8743/1: bL_switcher: add MODULE_LICENSE tag + +From: Arnd Bergmann + +commit a21b4c10c7bf5b58112afa20d6fa829e8d74e3e6 upstream. + +Without this tag, we get a build warning: + +WARNING: modpost: missing MODULE_LICENSE() in arch/arm/common/bL_switcher_dummy_if.o + +For completeness, I'm also adding author and description fields. + +Signed-off-by: Arnd Bergmann +Signed-off-by: Russell King +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/common/bL_switcher_dummy_if.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/arch/arm/common/bL_switcher_dummy_if.c ++++ b/arch/arm/common/bL_switcher_dummy_if.c +@@ -57,3 +57,7 @@ static struct miscdevice bL_switcher_dev + &bL_switcher_fops + }; + module_misc_device(bL_switcher_device); ++ ++MODULE_AUTHOR("Nicolas Pitre "); ++MODULE_LICENSE("GPL v2"); ++MODULE_DESCRIPTION("big.LITTLE switcher dummy user interface"); diff --git a/queue-4.15/arm64-dts-add-cooling-cells-to-cpu-nodes.patch b/queue-4.15/arm64-dts-add-cooling-cells-to-cpu-nodes.patch new file mode 100644 index 00000000000..aaf1dd4f821 --- /dev/null +++ b/queue-4.15/arm64-dts-add-cooling-cells-to-cpu-nodes.patch @@ -0,0 +1,46 @@ +From acbf76ee05067c3942852019993f7beb69a0f45f Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Wed, 10 Jan 2018 22:06:48 +0100 +Subject: arm64: dts: add #cooling-cells to CPU nodes + +From: Arnd Bergmann + +commit acbf76ee05067c3942852019993f7beb69a0f45f upstream. + +dtc complains about the lack of #coolin-cells properties for the +CPU nodes that are referred to as "cooling-device": + +arch/arm64/boot/dts/mediatek/mt8173-evb.dtb: Warning (cooling_device_property): Missing property '#cooling-cells' in node /cpus/cpu@0 or bad phandle (referred from /thermal-zones/cpu_thermal/cooling-maps/map@0:cooling-device[0]) +arch/arm64/boot/dts/mediatek/mt8173-evb.dtb: Warning (cooling_device_property): Missing property '#cooling-cells' in node /cpus/cpu@100 or bad phandle (referred from /thermal-zones/cpu_thermal/cooling-maps/map@1:cooling-device[0]) + +Apparently this property must be '<2>' to match the binding. + +Signed-off-by: Arnd Bergmann +Tested-by: Chunfeng Yun +Signed-off-by: Olof Johansson +[arnd: backported to 4.15] +Signed-off-by: Arnd Bergmann +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi ++++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi +@@ -81,6 +81,7 @@ + reg = <0x000>; + enable-method = "psci"; + cpu-idle-states = <&CPU_SLEEP_0>; ++ #cooling-cells = <2>; + }; + + cpu1: cpu@1 { +@@ -97,6 +98,7 @@ + reg = <0x100>; + enable-method = "psci"; + cpu-idle-states = <&CPU_SLEEP_0>; ++ #cooling-cells = <2>; + }; + + cpu3: cpu@101 { diff --git a/queue-4.15/asoc-ux500-add-module_license-tag.patch b/queue-4.15/asoc-ux500-add-module_license-tag.patch new file mode 100644 index 00000000000..1939cdc78f8 --- /dev/null +++ b/queue-4.15/asoc-ux500-add-module_license-tag.patch @@ -0,0 +1,48 @@ +From 1783c9d7cb7bc3181b9271665959b87280d98d8e Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Wed, 10 Jan 2018 17:34:45 +0100 +Subject: ASoC: ux500: add MODULE_LICENSE tag + +From: Arnd Bergmann + +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 +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -163,3 +163,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 +@@ -165,3 +165,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-4.15/series b/queue-4.15/series index d4d69743ba1..dc839f6f506 100644 --- a/queue-4.15/series +++ b/queue-4.15/series @@ -20,3 +20,8 @@ rds-tcp-correctly-sequence-cleanup-on-netns-deletion.patch rds-tcp-atomically-purge-entries-from-rds_tcp_conn_list-during-netns-delete.patch net-avoid-skb_warn_bad_offload-on-is_err.patch net_sched-gen_estimator-fix-lockdep-splat.patch +soc-qcom-rmtfs_mem-add-missing-module_description-author-license.patch +asoc-ux500-add-module_license-tag.patch +video-fbdev-mmp-add-module_license.patch +arm-8743-1-bl_switcher-add-module_license-tag.patch +arm64-dts-add-cooling-cells-to-cpu-nodes.patch diff --git a/queue-4.15/soc-qcom-rmtfs_mem-add-missing-module_description-author-license.patch b/queue-4.15/soc-qcom-rmtfs_mem-add-missing-module_description-author-license.patch new file mode 100644 index 00000000000..e85334914d1 --- /dev/null +++ b/queue-4.15/soc-qcom-rmtfs_mem-add-missing-module_description-author-license.patch @@ -0,0 +1,38 @@ +From 3b229bdb54cc83061b4b7840e3532316cb1ac7ce Mon Sep 17 00:00:00 2001 +From: Jesse Chan +Date: Mon, 20 Nov 2017 13:33:25 -0800 +Subject: soc: qcom: rmtfs_mem: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE + +From: Jesse Chan + +commit 3b229bdb54cc83061b4b7840e3532316cb1ac7ce upstream. + +This change resolves a new compile-time warning +when built as a loadable module: + +WARNING: modpost: missing MODULE_LICENSE() in drivers/soc/qcom/rmtfs_mem.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: Andy Gross +Cc: Arnd Bergmann +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/soc/qcom/rmtfs_mem.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/soc/qcom/rmtfs_mem.c ++++ b/drivers/soc/qcom/rmtfs_mem.c +@@ -267,3 +267,7 @@ static void qcom_rmtfs_mem_exit(void) + unregister_chrdev_region(qcom_rmtfs_mem_major, QCOM_RMTFS_MEM_DEV_MAX); + } + module_exit(qcom_rmtfs_mem_exit); ++ ++MODULE_AUTHOR("Linaro Ltd"); ++MODULE_DESCRIPTION("Qualcomm Remote Filesystem memory driver"); ++MODULE_LICENSE("GPL v2"); diff --git a/queue-4.15/video-fbdev-mmp-add-module_license.patch b/queue-4.15/video-fbdev-mmp-add-module_license.patch new file mode 100644 index 00000000000..e24cfa8ff5b --- /dev/null +++ b/queue-4.15/video-fbdev-mmp-add-module_license.patch @@ -0,0 +1,41 @@ +From c1530ac5a3ce93a1f02adabc4508b5fbf862dfe2 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Mon, 15 Jan 2018 17:04:22 +0100 +Subject: video: fbdev/mmp: add MODULE_LICENSE + +From: Arnd Bergmann + +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 +Signed-off-by: Bartlomiej Zolnierkiewicz +Signed-off-by: Greg Kroah-Hartman + +--- + 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 + #include + #include ++#include + #include