From: Greg Kroah-Hartman Date: Fri, 28 Feb 2020 13:35:55 +0000 (+0100) Subject: drop lib-stackdepot-fix-outdated-comments.patch from 4.9, 4.14, 4.19 X-Git-Tag: v4.4.215~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=17c72cbf1a7c3995eb0fb7a4a16eff3ab71e0645;p=thirdparty%2Fkernel%2Fstable-queue.git drop lib-stackdepot-fix-outdated-comments.patch from 4.9, 4.14, 4.19 --- diff --git a/queue-4.14/lib-stackdepot-fix-outdated-comments.patch b/queue-4.14/lib-stackdepot-fix-outdated-comments.patch deleted file mode 100644 index 560087fa7ff..00000000000 --- a/queue-4.14/lib-stackdepot-fix-outdated-comments.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 6c62f4f91e1c58c72add0647e08d3420391ba8b8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 15 Aug 2019 19:32:46 +0800 -Subject: lib/stackdepot: Fix outdated comments - -From: Miles Chen - -[ Upstream commit ee050dc83bc326ad5ef8ee93bca344819371e7a5 ] - -Replace "depot_save_stack" with "stack_depot_save" in code comments because -depot_save_stack() was replaced in commit c0cfc337264c ("lib/stackdepot: -Provide functions which operate on plain storage arrays") and removed in -commit 56d8f079c51a ("lib/stackdepot: Remove obsolete functions") - -Signed-off-by: Miles Chen -Signed-off-by: Thomas Gleixner -Link: https://lkml.kernel.org/r/20190815113246.18478-1-miles.chen@mediatek.com -Signed-off-by: Sasha Levin ---- - lib/stackdepot.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/stackdepot.c b/lib/stackdepot.c -index f87d138e96724..1724cb0d6283f 100644 ---- a/lib/stackdepot.c -+++ b/lib/stackdepot.c -@@ -96,7 +96,7 @@ static bool init_stack_slab(void **prealloc) - stack_slabs[depot_index + 1] = *prealloc; - /* - * This smp_store_release pairs with smp_load_acquire() from -- * |next_slab_inited| above and in depot_save_stack(). -+ * |next_slab_inited| above and in stack_depot_save(). - */ - smp_store_release(&next_slab_inited, 1); - } -@@ -123,7 +123,7 @@ static struct stack_record *depot_alloc_stack(unsigned long *entries, int size, - depot_offset = 0; - /* - * smp_store_release() here pairs with smp_load_acquire() from -- * |next_slab_inited| in depot_save_stack() and -+ * |next_slab_inited| in stack_depot_save() and - * init_stack_slab(). - */ - if (depot_index + 1 < STACK_ALLOC_MAX_SLABS) --- -2.20.1 - diff --git a/queue-4.14/lib-stackdepot.c-fix-global-out-of-bounds-in-stack_s.patch b/queue-4.14/lib-stackdepot.c-fix-global-out-of-bounds-in-stack_s.patch index 8970d4060d9..01db75bc840 100644 --- a/queue-4.14/lib-stackdepot.c-fix-global-out-of-bounds-in-stack_s.patch +++ b/queue-4.14/lib-stackdepot.c-fix-global-out-of-bounds-in-stack_s.patch @@ -28,14 +28,12 @@ Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- - lib/stackdepot.c | 8 ++++++-- + lib/stackdepot.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -diff --git a/lib/stackdepot.c b/lib/stackdepot.c -index 1724cb0d6283f..54fe55b6bbc0a 100644 --- a/lib/stackdepot.c +++ b/lib/stackdepot.c -@@ -92,15 +92,19 @@ static bool init_stack_slab(void **prealloc) +@@ -92,15 +92,19 @@ static bool init_stack_slab(void **preal return true; if (stack_slabs[depot_index] == NULL) { stack_slabs[depot_index] = *prealloc; @@ -49,7 +47,7 @@ index 1724cb0d6283f..54fe55b6bbc0a 100644 + } /* * This smp_store_release pairs with smp_load_acquire() from - * |next_slab_inited| above and in stack_depot_save(). + * |next_slab_inited| above and in depot_save_stack(). */ smp_store_release(&next_slab_inited, 1); } @@ -57,6 +55,3 @@ index 1724cb0d6283f..54fe55b6bbc0a 100644 return true; } --- -2.20.1 - diff --git a/queue-4.14/series b/queue-4.14/series index e8689785987..6bc8b0f24c2 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -202,7 +202,6 @@ xhci-apply-xhci_pme_stuck_quirk-to-intel-comet-lake-platforms.patch vt_resizex-get-rid-of-field-by-field-copyin.patch vt-vt_ioctl-fix-race-in-vt_resizex.patch serial-8250-check-upf_irq_shared-in-advance.patch -lib-stackdepot-fix-outdated-comments.patch lib-stackdepot.c-fix-global-out-of-bounds-in-stack_s.patch kvm-nvmx-don-t-emulate-instructions-in-guest-mode.patch ext4-fix-a-data-race-in-ext4_i-inode-i_disksize.patch diff --git a/queue-4.19/lib-stackdepot-fix-outdated-comments.patch b/queue-4.19/lib-stackdepot-fix-outdated-comments.patch deleted file mode 100644 index 587e601c255..00000000000 --- a/queue-4.19/lib-stackdepot-fix-outdated-comments.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 844d3e76628130384370c6ffa0c2db3da374bce4 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 15 Aug 2019 19:32:46 +0800 -Subject: lib/stackdepot: Fix outdated comments - -From: Miles Chen - -[ Upstream commit ee050dc83bc326ad5ef8ee93bca344819371e7a5 ] - -Replace "depot_save_stack" with "stack_depot_save" in code comments because -depot_save_stack() was replaced in commit c0cfc337264c ("lib/stackdepot: -Provide functions which operate on plain storage arrays") and removed in -commit 56d8f079c51a ("lib/stackdepot: Remove obsolete functions") - -Signed-off-by: Miles Chen -Signed-off-by: Thomas Gleixner -Link: https://lkml.kernel.org/r/20190815113246.18478-1-miles.chen@mediatek.com -Signed-off-by: Sasha Levin ---- - lib/stackdepot.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/stackdepot.c b/lib/stackdepot.c -index e513459a5601a..c5e06c43228f9 100644 ---- a/lib/stackdepot.c -+++ b/lib/stackdepot.c -@@ -96,7 +96,7 @@ static bool init_stack_slab(void **prealloc) - stack_slabs[depot_index + 1] = *prealloc; - /* - * This smp_store_release pairs with smp_load_acquire() from -- * |next_slab_inited| above and in depot_save_stack(). -+ * |next_slab_inited| above and in stack_depot_save(). - */ - smp_store_release(&next_slab_inited, 1); - } -@@ -123,7 +123,7 @@ static struct stack_record *depot_alloc_stack(unsigned long *entries, int size, - depot_offset = 0; - /* - * smp_store_release() here pairs with smp_load_acquire() from -- * |next_slab_inited| in depot_save_stack() and -+ * |next_slab_inited| in stack_depot_save() and - * init_stack_slab(). - */ - if (depot_index + 1 < STACK_ALLOC_MAX_SLABS) --- -2.20.1 - diff --git a/queue-4.19/lib-stackdepot.c-fix-global-out-of-bounds-in-stack_s.patch b/queue-4.19/lib-stackdepot.c-fix-global-out-of-bounds-in-stack_s.patch index 74b9aa58559..3e4f2ed55b1 100644 --- a/queue-4.19/lib-stackdepot.c-fix-global-out-of-bounds-in-stack_s.patch +++ b/queue-4.19/lib-stackdepot.c-fix-global-out-of-bounds-in-stack_s.patch @@ -28,14 +28,12 @@ Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- - lib/stackdepot.c | 8 ++++++-- + lib/stackdepot.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -diff --git a/lib/stackdepot.c b/lib/stackdepot.c -index c5e06c43228f9..34c71973932e0 100644 --- a/lib/stackdepot.c +++ b/lib/stackdepot.c -@@ -92,15 +92,19 @@ static bool init_stack_slab(void **prealloc) +@@ -92,15 +92,19 @@ static bool init_stack_slab(void **preal return true; if (stack_slabs[depot_index] == NULL) { stack_slabs[depot_index] = *prealloc; @@ -49,7 +47,7 @@ index c5e06c43228f9..34c71973932e0 100644 + } /* * This smp_store_release pairs with smp_load_acquire() from - * |next_slab_inited| above and in stack_depot_save(). + * |next_slab_inited| above and in depot_save_stack(). */ smp_store_release(&next_slab_inited, 1); } @@ -57,6 +55,3 @@ index c5e06c43228f9..34c71973932e0 100644 return true; } --- -2.20.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 5470e17c798..2bbb8d82114 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -56,7 +56,6 @@ tty-serial-qcom_geni_serial-remove-use-of-_relaxed-a.patch tty-serial-qcom_geni_serial-remove-set_rfr_wm-and-re.patch tty-serial-qcom_geni_serial-remove-xfer_mode-variabl.patch tty-serial-qcom_geni_serial-fix-rx-cancel-command-fa.patch -lib-stackdepot-fix-outdated-comments.patch lib-stackdepot.c-fix-global-out-of-bounds-in-stack_s.patch drm-nouveau-kms-gv100-re-set-lut-after-clearing-for-.patch ext4-fix-a-data-race-in-ext4_i-inode-i_disksize.patch diff --git a/queue-4.9/lib-stackdepot-fix-outdated-comments.patch b/queue-4.9/lib-stackdepot-fix-outdated-comments.patch deleted file mode 100644 index 3fca9d97ca6..00000000000 --- a/queue-4.9/lib-stackdepot-fix-outdated-comments.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 8cb561148e3470eefbd847cf13f1073256115caf Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 15 Aug 2019 19:32:46 +0800 -Subject: lib/stackdepot: Fix outdated comments - -From: Miles Chen - -[ Upstream commit ee050dc83bc326ad5ef8ee93bca344819371e7a5 ] - -Replace "depot_save_stack" with "stack_depot_save" in code comments because -depot_save_stack() was replaced in commit c0cfc337264c ("lib/stackdepot: -Provide functions which operate on plain storage arrays") and removed in -commit 56d8f079c51a ("lib/stackdepot: Remove obsolete functions") - -Signed-off-by: Miles Chen -Signed-off-by: Thomas Gleixner -Link: https://lkml.kernel.org/r/20190815113246.18478-1-miles.chen@mediatek.com -Signed-off-by: Sasha Levin ---- - lib/stackdepot.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/stackdepot.c b/lib/stackdepot.c -index f87d138e96724..1724cb0d6283f 100644 ---- a/lib/stackdepot.c -+++ b/lib/stackdepot.c -@@ -96,7 +96,7 @@ static bool init_stack_slab(void **prealloc) - stack_slabs[depot_index + 1] = *prealloc; - /* - * This smp_store_release pairs with smp_load_acquire() from -- * |next_slab_inited| above and in depot_save_stack(). -+ * |next_slab_inited| above and in stack_depot_save(). - */ - smp_store_release(&next_slab_inited, 1); - } -@@ -123,7 +123,7 @@ static struct stack_record *depot_alloc_stack(unsigned long *entries, int size, - depot_offset = 0; - /* - * smp_store_release() here pairs with smp_load_acquire() from -- * |next_slab_inited| in depot_save_stack() and -+ * |next_slab_inited| in stack_depot_save() and - * init_stack_slab(). - */ - if (depot_index + 1 < STACK_ALLOC_MAX_SLABS) --- -2.20.1 - diff --git a/queue-4.9/lib-stackdepot.c-fix-global-out-of-bounds-in-stack_s.patch b/queue-4.9/lib-stackdepot.c-fix-global-out-of-bounds-in-stack_s.patch index 357915a5a76..f042aedf5ae 100644 --- a/queue-4.9/lib-stackdepot.c-fix-global-out-of-bounds-in-stack_s.patch +++ b/queue-4.9/lib-stackdepot.c-fix-global-out-of-bounds-in-stack_s.patch @@ -28,14 +28,12 @@ Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- - lib/stackdepot.c | 8 ++++++-- + lib/stackdepot.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -diff --git a/lib/stackdepot.c b/lib/stackdepot.c -index 1724cb0d6283f..54fe55b6bbc0a 100644 --- a/lib/stackdepot.c +++ b/lib/stackdepot.c -@@ -92,15 +92,19 @@ static bool init_stack_slab(void **prealloc) +@@ -92,15 +92,19 @@ static bool init_stack_slab(void **preal return true; if (stack_slabs[depot_index] == NULL) { stack_slabs[depot_index] = *prealloc; @@ -49,7 +47,7 @@ index 1724cb0d6283f..54fe55b6bbc0a 100644 + } /* * This smp_store_release pairs with smp_load_acquire() from - * |next_slab_inited| above and in stack_depot_save(). + * |next_slab_inited| above and in depot_save_stack(). */ smp_store_release(&next_slab_inited, 1); } @@ -57,6 +55,3 @@ index 1724cb0d6283f..54fe55b6bbc0a 100644 return true; } --- -2.20.1 - diff --git a/queue-4.9/series b/queue-4.9/series index 4b422dc97e2..c9d29fca235 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -135,7 +135,6 @@ xhci-apply-xhci_pme_stuck_quirk-to-intel-comet-lake-platforms.patch kvm-x86-don-t-notify-userspace-ioapic-on-edge-triggered-interrupt-eoi.patch vt_resizex-get-rid-of-field-by-field-copyin.patch vt-vt_ioctl-fix-race-in-vt_resizex.patch -lib-stackdepot-fix-outdated-comments.patch lib-stackdepot.c-fix-global-out-of-bounds-in-stack_s.patch kvm-nvmx-don-t-emulate-instructions-in-guest-mode.patch netfilter-xt_bpf-add-overflow-checks.patch