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 (file)
index 560087f..0000000
--- 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 <sashal@kernel.org>
-Date: Thu, 15 Aug 2019 19:32:46 +0800
-Subject: lib/stackdepot: Fix outdated comments
-
-From: Miles Chen <miles.chen@mediatek.com>
-
-[ 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 <miles.chen@mediatek.com>
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-Link: https://lkml.kernel.org/r/20190815113246.18478-1-miles.chen@mediatek.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 8970d4060d9a12bd4566b4d3847ed2751b2c87a3..01db75bc8409077450a102398a6fed71a6af2952 100644 (file)
--- 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 <akpm@linux-foundation.org>
 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- 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 e86897859870e074dbf1f5249f0f9ffbe43cfdee..6bc8b0f24c2eb82b6b4495e9f0f6550f9baca869 100644 (file)
--- 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 (file)
index 587e601..0000000
--- 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 <sashal@kernel.org>
-Date: Thu, 15 Aug 2019 19:32:46 +0800
-Subject: lib/stackdepot: Fix outdated comments
-
-From: Miles Chen <miles.chen@mediatek.com>
-
-[ 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 <miles.chen@mediatek.com>
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-Link: https://lkml.kernel.org/r/20190815113246.18478-1-miles.chen@mediatek.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 74b9aa585592eca2fd12c41e6e1b19098266b8f8..3e4f2ed55b199dfaa57a22a6210924734f4ef04a 100644 (file)
--- 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 <akpm@linux-foundation.org>
 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- 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 5470e17c798ef566954ff9e91c83badd70c100f9..2bbb8d82114dee624194ead6c74b50f7dd512886 100644 (file)
--- 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 (file)
index 3fca9d9..0000000
--- 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 <sashal@kernel.org>
-Date: Thu, 15 Aug 2019 19:32:46 +0800
-Subject: lib/stackdepot: Fix outdated comments
-
-From: Miles Chen <miles.chen@mediatek.com>
-
-[ 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 <miles.chen@mediatek.com>
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-Link: https://lkml.kernel.org/r/20190815113246.18478-1-miles.chen@mediatek.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 357915a5a7689ab78b48fc18646b949994b0e440..f042aedf5aef95b2829ddbc89b0c973f44d9badd 100644 (file)
--- 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 <akpm@linux-foundation.org>
 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- 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 4b422dc97e20522489395d5f4de5dba26f2b40d2..c9d29fca2351f8c2aade6a2b774fa4900063c6da 100644 (file)
--- 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