From: Greg Kroah-Hartman Date: Sun, 23 Feb 2020 17:20:39 +0000 (+0100) Subject: drop some patches. X-Git-Tag: v4.19.106~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ed39c2d495064397ba3751e4ec8d124f8a5eb1f;p=thirdparty%2Fkernel%2Fstable-queue.git drop some patches. Deleted: queue-4.14/x86-unwind-orc-fix-config_modules-build-warning.patch queue-4.19/x86-unwind-orc-fix-config_modules-build-warning.patch queue-5.4/arm-omap2-pdata-quirks-add-prm-data-for-reset-suppor.patch queue-5.4/x86-unwind-orc-fix-config_modules-build-warning.patch queue-5.5/arm-omap2-pdata-quirks-add-prm-data-for-reset-suppor.patch queue-5.5/x86-unwind-orc-fix-config_modules-build-warning.patch --- diff --git a/queue-4.14/series b/queue-4.14/series index 7d51dbddd63..dbba9e422a8 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -92,7 +92,6 @@ clk-sunxi-ng-add-mux-and-pll-notifiers-for-a64-cpu-c.patch alsa-sh-fix-unused-variable-warnings.patch alsa-sh-fix-compile-warning-wrt-const.patch tools-lib-api-fs-fix-gcc9-stringop-truncation-compil.patch -x86-unwind-orc-fix-config_modules-build-warning.patch drm-remove-the-newline-for-crc-source-name.patch usbip-fix-unsafe-unaligned-pointer-usage.patch udf-fix-free-space-reporting-for-metadata-and-virtua.patch diff --git a/queue-4.14/x86-unwind-orc-fix-config_modules-build-warning.patch b/queue-4.14/x86-unwind-orc-fix-config_modules-build-warning.patch deleted file mode 100644 index e9af487f8d4..00000000000 --- a/queue-4.14/x86-unwind-orc-fix-config_modules-build-warning.patch +++ /dev/null @@ -1,55 +0,0 @@ -From b311b11cbb1f15f40ebd6402cc90603d2cb6fcbf Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 16 Dec 2019 11:07:29 +0800 -Subject: x86/unwind/orc: Fix !CONFIG_MODULES build warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Shile Zhang - -[ Upstream commit 22a7fa8848c5e881d87ef2f7f3c2ea77b286e6f9 ] - -To fix follwowing warning due to ORC sort moved to build time: - - arch/x86/kernel/unwind_orc.c:210:12: warning: ‘orc_sort_cmp’ defined but not used [-Wunused-function] - arch/x86/kernel/unwind_orc.c:190:13: warning: ‘orc_sort_swap’ defined but not used [-Wunused-function] - -Signed-off-by: Shile Zhang -Reported-by: Stephen Rothwell -Cc: Andy Lutomirski -Cc: Borislav Petkov -Cc: Josh Poimboeuf -Cc: Peter Zijlstra -Cc: Thomas Gleixner -Link: https://lkml.kernel.org/r/c9c81536-2afc-c8aa-c5f8-c7618ecd4f54@linux.alibaba.com -Signed-off-by: Ingo Molnar -Signed-off-by: Sasha Levin ---- - arch/x86/kernel/unwind_orc.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/arch/x86/kernel/unwind_orc.c b/arch/x86/kernel/unwind_orc.c -index 3bbb399f7ead3..5ac0e0359b668 100644 ---- a/arch/x86/kernel/unwind_orc.c -+++ b/arch/x86/kernel/unwind_orc.c -@@ -131,6 +131,8 @@ static struct orc_entry *orc_find(unsigned long ip) - return orc_module_find(ip); - } - -+#ifdef CONFIG_MODULES -+ - static void orc_sort_swap(void *_a, void *_b, int size) - { - struct orc_entry *orc_a, *orc_b; -@@ -173,7 +175,6 @@ static int orc_sort_cmp(const void *_a, const void *_b) - return orc_a->sp_reg == ORC_REG_UNDEFINED ? -1 : 1; - } - --#ifdef CONFIG_MODULES - void unwind_module_init(struct module *mod, void *_orc_ip, size_t orc_ip_size, - void *_orc, size_t orc_size) - { --- -2.20.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 81bd5b391fe..c58193ed215 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -92,7 +92,6 @@ alsa-sh-fix-unused-variable-warnings.patch clk-uniphier-add-scssi-clock-gate-for-each-channel.patch alsa-sh-fix-compile-warning-wrt-const.patch tools-lib-api-fs-fix-gcc9-stringop-truncation-compil.patch -x86-unwind-orc-fix-config_modules-build-warning.patch acpi-button-add-dmi-quirk-for-razer-blade-stealth-13.patch mlx5-work-around-high-stack-usage-with-gcc.patch drm-remove-the-newline-for-crc-source-name.patch diff --git a/queue-4.19/x86-unwind-orc-fix-config_modules-build-warning.patch b/queue-4.19/x86-unwind-orc-fix-config_modules-build-warning.patch deleted file mode 100644 index 29a14db4081..00000000000 --- a/queue-4.19/x86-unwind-orc-fix-config_modules-build-warning.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 21942850076d93de514aff13ee631987540e2c14 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 16 Dec 2019 11:07:29 +0800 -Subject: x86/unwind/orc: Fix !CONFIG_MODULES build warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Shile Zhang - -[ Upstream commit 22a7fa8848c5e881d87ef2f7f3c2ea77b286e6f9 ] - -To fix follwowing warning due to ORC sort moved to build time: - - arch/x86/kernel/unwind_orc.c:210:12: warning: ‘orc_sort_cmp’ defined but not used [-Wunused-function] - arch/x86/kernel/unwind_orc.c:190:13: warning: ‘orc_sort_swap’ defined but not used [-Wunused-function] - -Signed-off-by: Shile Zhang -Reported-by: Stephen Rothwell -Cc: Andy Lutomirski -Cc: Borislav Petkov -Cc: Josh Poimboeuf -Cc: Peter Zijlstra -Cc: Thomas Gleixner -Link: https://lkml.kernel.org/r/c9c81536-2afc-c8aa-c5f8-c7618ecd4f54@linux.alibaba.com -Signed-off-by: Ingo Molnar -Signed-off-by: Sasha Levin ---- - arch/x86/kernel/unwind_orc.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/arch/x86/kernel/unwind_orc.c b/arch/x86/kernel/unwind_orc.c -index 89be1be1790c4..a3cb70fbe941a 100644 ---- a/arch/x86/kernel/unwind_orc.c -+++ b/arch/x86/kernel/unwind_orc.c -@@ -176,6 +176,8 @@ static struct orc_entry *orc_find(unsigned long ip) - return orc_ftrace_find(ip); - } - -+#ifdef CONFIG_MODULES -+ - static void orc_sort_swap(void *_a, void *_b, int size) - { - struct orc_entry *orc_a, *orc_b; -@@ -218,7 +220,6 @@ static int orc_sort_cmp(const void *_a, const void *_b) - return orc_a->sp_reg == ORC_REG_UNDEFINED && !orc_a->end ? -1 : 1; - } - --#ifdef CONFIG_MODULES - void unwind_module_init(struct module *mod, void *_orc_ip, size_t orc_ip_size, - void *_orc, size_t orc_size) - { --- -2.20.1 - diff --git a/queue-5.4/arm-omap2-pdata-quirks-add-prm-data-for-reset-suppor.patch b/queue-5.4/arm-omap2-pdata-quirks-add-prm-data-for-reset-suppor.patch deleted file mode 100644 index bb7ed6f1913..00000000000 --- a/queue-5.4/arm-omap2-pdata-quirks-add-prm-data-for-reset-suppor.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 8946c9834ff7182a4119fb3091abdf314dd022c0 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 12 Dec 2019 15:05:37 +0200 -Subject: ARM: OMAP2+: pdata-quirks: add PRM data for reset support - -From: Tero Kristo - -[ Upstream commit 8de44fb70659a5bc0c53a443e6129ea1bf00fd8b ] - -The parent clockdomain for reset must be in force wakeup mode, otherwise -the reset may never complete. Add pdata quirks for this purpose for PRM -driver. - -Signed-off-by: Tero Kristo -Acked-by: Tony Lindgren -Signed-off-by: Tony Lindgren -Signed-off-by: Sasha Levin ---- - arch/arm/mach-omap2/pdata-quirks.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c -index 247e3f8acffe6..2657752b90670 100644 ---- a/arch/arm/mach-omap2/pdata-quirks.c -+++ b/arch/arm/mach-omap2/pdata-quirks.c -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - - #include "clockdomain.h" - #include "common.h" -@@ -463,6 +464,12 @@ void omap_pcs_legacy_init(int irq, void (*rearm)(void)) - pcs_pdata.rearm = rearm; - } - -+static struct ti_prm_platform_data ti_prm_pdata = { -+ .clkdm_deny_idle = clkdm_deny_idle, -+ .clkdm_allow_idle = clkdm_allow_idle, -+ .clkdm_lookup = clkdm_lookup, -+}; -+ - /* - * GPIOs for TWL are initialized by the I2C bus and need custom - * handing until DSS has device tree bindings. -@@ -565,6 +572,7 @@ static struct of_dev_auxdata omap_auxdata_lookup[] = { - /* Common auxdata */ - OF_DEV_AUXDATA("ti,sysc", 0, NULL, &ti_sysc_pdata), - OF_DEV_AUXDATA("pinctrl-single", 0, NULL, &pcs_pdata), -+ OF_DEV_AUXDATA("ti,omap-prm-inst", 0, NULL, &ti_prm_pdata), - { /* sentinel */ }, - }; - --- -2.20.1 - diff --git a/queue-5.4/series b/queue-5.4/series index bc4dc8828d7..d2dda014796 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -125,7 +125,6 @@ reiserfs-fix-spurious-unlock-in-reiserfs_fill_super-.patch samples-bpf-set-fno-stack-protector-when-building-bp.patch r8169-check-that-realtek-phy-driver-module-is-loaded.patch fore200e-fix-incorrect-checks-of-null-pointer-derefe.patch -arm-omap2-pdata-quirks-add-prm-data-for-reset-suppor.patch netfilter-nft_tunnel-add-the-missing-erspan_version-.patch alsa-usx2y-adjust-indentation-in-snd_usx2y_hwdep_dsp.patch pci-add-nr_devfns-parameter-to-pci_add_dma_alias.patch @@ -176,7 +175,6 @@ net-phy-fixed_phy-fix-use-after-free-when-checking-l.patch tools-lib-api-fs-fix-gcc9-stringop-truncation-compil.patch vfio-spapr-nvlink2-skip-unpinning-pages-on-error-exi.patch asoc-intel-sof_rt5682-ignore-the-speaker-amp-when-th.patch -x86-unwind-orc-fix-config_modules-build-warning.patch acpi-button-add-dmi-quirk-for-razer-blade-stealth-13.patch iommu-vt-d-match-cpu-and-iommu-paging-mode.patch iommu-vt-d-avoid-sending-invalid-page-response.patch diff --git a/queue-5.4/x86-unwind-orc-fix-config_modules-build-warning.patch b/queue-5.4/x86-unwind-orc-fix-config_modules-build-warning.patch deleted file mode 100644 index 54b4f98f7b8..00000000000 --- a/queue-5.4/x86-unwind-orc-fix-config_modules-build-warning.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 5b6080587a27e11fce6357eb5227dcb8a68cf326 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 16 Dec 2019 11:07:29 +0800 -Subject: x86/unwind/orc: Fix !CONFIG_MODULES build warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Shile Zhang - -[ Upstream commit 22a7fa8848c5e881d87ef2f7f3c2ea77b286e6f9 ] - -To fix follwowing warning due to ORC sort moved to build time: - - arch/x86/kernel/unwind_orc.c:210:12: warning: ‘orc_sort_cmp’ defined but not used [-Wunused-function] - arch/x86/kernel/unwind_orc.c:190:13: warning: ‘orc_sort_swap’ defined but not used [-Wunused-function] - -Signed-off-by: Shile Zhang -Reported-by: Stephen Rothwell -Cc: Andy Lutomirski -Cc: Borislav Petkov -Cc: Josh Poimboeuf -Cc: Peter Zijlstra -Cc: Thomas Gleixner -Link: https://lkml.kernel.org/r/c9c81536-2afc-c8aa-c5f8-c7618ecd4f54@linux.alibaba.com -Signed-off-by: Ingo Molnar -Signed-off-by: Sasha Levin ---- - arch/x86/kernel/unwind_orc.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/arch/x86/kernel/unwind_orc.c b/arch/x86/kernel/unwind_orc.c -index 332ae6530fa88..7a9306bc5982f 100644 ---- a/arch/x86/kernel/unwind_orc.c -+++ b/arch/x86/kernel/unwind_orc.c -@@ -187,6 +187,8 @@ static struct orc_entry *orc_find(unsigned long ip) - return orc_ftrace_find(ip); - } - -+#ifdef CONFIG_MODULES -+ - static void orc_sort_swap(void *_a, void *_b, int size) - { - struct orc_entry *orc_a, *orc_b; -@@ -229,7 +231,6 @@ static int orc_sort_cmp(const void *_a, const void *_b) - return orc_a->sp_reg == ORC_REG_UNDEFINED && !orc_a->end ? -1 : 1; - } - --#ifdef CONFIG_MODULES - void unwind_module_init(struct module *mod, void *_orc_ip, size_t orc_ip_size, - void *_orc, size_t orc_size) - { --- -2.20.1 - diff --git a/queue-5.5/arm-omap2-pdata-quirks-add-prm-data-for-reset-suppor.patch b/queue-5.5/arm-omap2-pdata-quirks-add-prm-data-for-reset-suppor.patch deleted file mode 100644 index d0590e880ad..00000000000 --- a/queue-5.5/arm-omap2-pdata-quirks-add-prm-data-for-reset-suppor.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 0d0f63c35cda97742d349cd81ded472b99656503 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 12 Dec 2019 15:05:37 +0200 -Subject: ARM: OMAP2+: pdata-quirks: add PRM data for reset support - -From: Tero Kristo - -[ Upstream commit 8de44fb70659a5bc0c53a443e6129ea1bf00fd8b ] - -The parent clockdomain for reset must be in force wakeup mode, otherwise -the reset may never complete. Add pdata quirks for this purpose for PRM -driver. - -Signed-off-by: Tero Kristo -Acked-by: Tony Lindgren -Signed-off-by: Tony Lindgren -Signed-off-by: Sasha Levin ---- - arch/arm/mach-omap2/pdata-quirks.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c -index e95c224ffc4d8..7a79bcc02a11b 100644 ---- a/arch/arm/mach-omap2/pdata-quirks.c -+++ b/arch/arm/mach-omap2/pdata-quirks.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #include "clockdomain.h" - #include "common.h" -@@ -412,6 +413,12 @@ void omap_pcs_legacy_init(int irq, void (*rearm)(void)) - pcs_pdata.rearm = rearm; - } - -+static struct ti_prm_platform_data ti_prm_pdata = { -+ .clkdm_deny_idle = clkdm_deny_idle, -+ .clkdm_allow_idle = clkdm_allow_idle, -+ .clkdm_lookup = clkdm_lookup, -+}; -+ - /* - * GPIOs for TWL are initialized by the I2C bus and need custom - * handing until DSS has device tree bindings. -@@ -514,6 +521,7 @@ static struct of_dev_auxdata omap_auxdata_lookup[] = { - /* Common auxdata */ - OF_DEV_AUXDATA("ti,sysc", 0, NULL, &ti_sysc_pdata), - OF_DEV_AUXDATA("pinctrl-single", 0, NULL, &pcs_pdata), -+ OF_DEV_AUXDATA("ti,omap-prm-inst", 0, NULL, &ti_prm_pdata), - { /* sentinel */ }, - }; - --- -2.20.1 - diff --git a/queue-5.5/series b/queue-5.5/series index 98ba482b6ee..d202e3abe04 100644 --- a/queue-5.5/series +++ b/queue-5.5/series @@ -141,7 +141,6 @@ samples-bpf-set-fno-stack-protector-when-building-bp.patch r8169-check-that-realtek-phy-driver-module-is-loaded.patch fore200e-fix-incorrect-checks-of-null-pointer-derefe.patch x86-mce-therm_throt-mark-throttle_active_work-as-__m.patch -arm-omap2-pdata-quirks-add-prm-data-for-reset-suppor.patch netfilter-nft_tunnel-add-the-missing-erspan_version-.patch alsa-usx2y-adjust-indentation-in-snd_usx2y_hwdep_dsp.patch nfs-fix-timstamp-debug-prints.patch @@ -203,7 +202,6 @@ net-phy-fixed_phy-fix-use-after-free-when-checking-l.patch tools-lib-api-fs-fix-gcc9-stringop-truncation-compil.patch vfio-spapr-nvlink2-skip-unpinning-pages-on-error-exi.patch asoc-intel-sof_rt5682-ignore-the-speaker-amp-when-th.patch -x86-unwind-orc-fix-config_modules-build-warning.patch acpi-button-add-dmi-quirk-for-razer-blade-stealth-13.patch iommu-vt-d-match-cpu-and-iommu-paging-mode.patch iommu-vt-d-avoid-sending-invalid-page-response.patch diff --git a/queue-5.5/x86-unwind-orc-fix-config_modules-build-warning.patch b/queue-5.5/x86-unwind-orc-fix-config_modules-build-warning.patch deleted file mode 100644 index da2f8573ef5..00000000000 --- a/queue-5.5/x86-unwind-orc-fix-config_modules-build-warning.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 2699ccb6e2b3849abbaf81a3696425cf55fc2667 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 16 Dec 2019 11:07:29 +0800 -Subject: x86/unwind/orc: Fix !CONFIG_MODULES build warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Shile Zhang - -[ Upstream commit 22a7fa8848c5e881d87ef2f7f3c2ea77b286e6f9 ] - -To fix follwowing warning due to ORC sort moved to build time: - - arch/x86/kernel/unwind_orc.c:210:12: warning: ‘orc_sort_cmp’ defined but not used [-Wunused-function] - arch/x86/kernel/unwind_orc.c:190:13: warning: ‘orc_sort_swap’ defined but not used [-Wunused-function] - -Signed-off-by: Shile Zhang -Reported-by: Stephen Rothwell -Cc: Andy Lutomirski -Cc: Borislav Petkov -Cc: Josh Poimboeuf -Cc: Peter Zijlstra -Cc: Thomas Gleixner -Link: https://lkml.kernel.org/r/c9c81536-2afc-c8aa-c5f8-c7618ecd4f54@linux.alibaba.com -Signed-off-by: Ingo Molnar -Signed-off-by: Sasha Levin ---- - arch/x86/kernel/unwind_orc.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/arch/x86/kernel/unwind_orc.c b/arch/x86/kernel/unwind_orc.c -index 332ae6530fa88..7a9306bc5982f 100644 ---- a/arch/x86/kernel/unwind_orc.c -+++ b/arch/x86/kernel/unwind_orc.c -@@ -187,6 +187,8 @@ static struct orc_entry *orc_find(unsigned long ip) - return orc_ftrace_find(ip); - } - -+#ifdef CONFIG_MODULES -+ - static void orc_sort_swap(void *_a, void *_b, int size) - { - struct orc_entry *orc_a, *orc_b; -@@ -229,7 +231,6 @@ static int orc_sort_cmp(const void *_a, const void *_b) - return orc_a->sp_reg == ORC_REG_UNDEFINED && !orc_a->end ? -1 : 1; - } - --#ifdef CONFIG_MODULES - void unwind_module_init(struct module *mod, void *_orc_ip, size_t orc_ip_size, - void *_orc, size_t orc_size) - { --- -2.20.1 -