From: Greg Kroah-Hartman Date: Fri, 6 Oct 2017 09:21:12 +0000 (+0200) Subject: drop pinctrl-mvebu-use-seq_puts-in-mvebu_pinconf_group_dbg_show.patch from 4.4 and... X-Git-Tag: v3.18.74~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=31e8440df5b5e4b2d95eaa2e56a3b8464f5f8e3c;p=thirdparty%2Fkernel%2Fstable-queue.git drop pinctrl-mvebu-use-seq_puts-in-mvebu_pinconf_group_dbg_show.patch from 4.4 and 4.9 queues --- diff --git a/queue-4.4/pinctrl-mvebu-use-seq_puts-in-mvebu_pinconf_group_dbg_show.patch b/queue-4.4/pinctrl-mvebu-use-seq_puts-in-mvebu_pinconf_group_dbg_show.patch deleted file mode 100644 index 0290d54200d..00000000000 --- a/queue-4.4/pinctrl-mvebu-use-seq_puts-in-mvebu_pinconf_group_dbg_show.patch +++ /dev/null @@ -1,50 +0,0 @@ -From foo@baz Thu Oct 5 10:49:14 CEST 2017 -From: Markus Elfring -Date: Thu, 12 Jan 2017 16:51:00 +0100 -Subject: pinctrl: mvebu: Use seq_puts() in mvebu_pinconf_group_dbg_show() - -From: Markus Elfring - - -[ Upstream commit 420dc61642920849d824a0de2aa853db59f5244f ] - -Strings which did not contain data format specifications should be put -into a sequence. Thus use the corresponding function "seq_puts". - -This issue was detected by using the Coccinelle software. - -Signed-off-by: Markus Elfring -Signed-off-by: Linus Walleij -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/pinctrl/mvebu/pinctrl-mvebu.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - ---- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c -+++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c -@@ -195,11 +195,12 @@ static void mvebu_pinconf_group_dbg_show - seq_printf(s, "o"); - seq_printf(s, ")"); - } -- } else -- seq_printf(s, "current: UNKNOWN"); -+ } else { -+ seq_puts(s, "current: UNKNOWN"); -+ } - - if (grp->num_settings > 1) { -- seq_printf(s, ", available = ["); -+ seq_puts(s, ", available = ["); - for (n = 0; n < grp->num_settings; n++) { - if (curr == &grp->settings[n]) - continue; -@@ -222,7 +223,7 @@ static void mvebu_pinconf_group_dbg_show - seq_printf(s, ")"); - } - } -- seq_printf(s, " ]"); -+ seq_puts(s, " ]"); - } - return; - } diff --git a/queue-4.4/series b/queue-4.4/series index 1b1fbf1a0ec..7ef01f8676e 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -19,7 +19,6 @@ ib-ipoib-replace-list_del-of-the-neigh-list-with-list_del_init.patch drm-amdkfd-fix-improper-return-value-on-error.patch usb-serial-mos7720-fix-control-message-error-handling.patch usb-serial-mos7840-fix-control-message-error-handling.patch -pinctrl-mvebu-use-seq_puts-in-mvebu_pinconf_group_dbg_show.patch partitions-efi-fix-integer-overflow-in-gpt-size-calculation.patch asoc-dapm-handle-probe-deferrals.patch audit-log-32-bit-socketcalls.patch diff --git a/queue-4.9/mips-kexec-do-not-reserve-invalid-crashkernel-memory-on-boot.patch b/queue-4.9/mips-kexec-do-not-reserve-invalid-crashkernel-memory-on-boot.patch index fcec5d73ce5..b86b27a861b 100644 --- a/queue-4.9/mips-kexec-do-not-reserve-invalid-crashkernel-memory-on-boot.patch +++ b/queue-4.9/mips-kexec-do-not-reserve-invalid-crashkernel-memory-on-boot.patch @@ -26,7 +26,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c -@@ -668,6 +668,11 @@ static void __init mips_parse_crashkerne +@@ -664,6 +664,11 @@ static void __init mips_parse_crashkerne if (ret != 0 || crash_size <= 0) return; diff --git a/queue-4.9/pinctrl-mvebu-use-seq_puts-in-mvebu_pinconf_group_dbg_show.patch b/queue-4.9/pinctrl-mvebu-use-seq_puts-in-mvebu_pinconf_group_dbg_show.patch deleted file mode 100644 index 0071e03ea3c..00000000000 --- a/queue-4.9/pinctrl-mvebu-use-seq_puts-in-mvebu_pinconf_group_dbg_show.patch +++ /dev/null @@ -1,50 +0,0 @@ -From foo@baz Thu Oct 5 10:28:31 CEST 2017 -From: Markus Elfring -Date: Thu, 12 Jan 2017 16:51:00 +0100 -Subject: pinctrl: mvebu: Use seq_puts() in mvebu_pinconf_group_dbg_show() - -From: Markus Elfring - - -[ Upstream commit 420dc61642920849d824a0de2aa853db59f5244f ] - -Strings which did not contain data format specifications should be put -into a sequence. Thus use the corresponding function "seq_puts". - -This issue was detected by using the Coccinelle software. - -Signed-off-by: Markus Elfring -Signed-off-by: Linus Walleij -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/pinctrl/mvebu/pinctrl-mvebu.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - ---- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c -+++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c -@@ -195,11 +195,12 @@ static void mvebu_pinconf_group_dbg_show - seq_printf(s, "o"); - seq_printf(s, ")"); - } -- } else -- seq_printf(s, "current: UNKNOWN"); -+ } else { -+ seq_puts(s, "current: UNKNOWN"); -+ } - - if (grp->num_settings > 1) { -- seq_printf(s, ", available = ["); -+ seq_puts(s, ", available = ["); - for (n = 0; n < grp->num_settings; n++) { - if (curr == &grp->settings[n]) - continue; -@@ -222,7 +223,7 @@ static void mvebu_pinconf_group_dbg_show - seq_printf(s, ")"); - } - } -- seq_printf(s, " ]"); -+ seq_puts(s, " ]"); - } - return; - } diff --git a/queue-4.9/series b/queue-4.9/series index bd460d6c100..43491524d92 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -38,7 +38,6 @@ drm-amdkfd-fix-improper-return-value-on-error.patch usb-serial-mos7720-fix-control-message-error-handling.patch usb-serial-mos7840-fix-control-message-error-handling.patch sfc-get-pio-buffer-size-from-the-nic.patch -pinctrl-mvebu-use-seq_puts-in-mvebu_pinconf_group_dbg_show.patch partitions-efi-fix-integer-overflow-in-gpt-size-calculation.patch asoc-dapm-handle-probe-deferrals.patch audit-log-32-bit-socketcalls.patch