[folded-merged] test_xarray-add-tests-for-advanced-multi-index-use-fix-fix.patch removed from -mm tree

[folded-merged] test_xarray-add-tests-for-advanced-multi-index-use-fix-fix.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: test_xarray-fix-soft-lockup-for-advanced-api-tests-fix
has been removed from the -mm tree.  Its filename was
     test_xarray-add-tests-for-advanced-multi-index-use-fix-fix.patch

This patch was dropped because it was folded into test_xarray-add-tests-for-advanced-multi-index-use.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: test_xarray-fix-soft-lockup-for-advanced-api-tests-fix
Date: Mon Feb 19 06:23:18 PM PST 2024

s/i/loops/, make non-static

Cc: Luis Chamberlain <mcgrof@kernel.org>
Cc: Daniel Gomez <da.gomez@samsung.com>
Cc: Luis Chamberlain <mcgrof@kernel.org>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Pankaj Raghav <p.raghav@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 lib/test_xarray.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/lib/test_xarray.c~test_xarray-add-tests-for-advanced-multi-index-use-fix-fix
+++ a/lib/test_xarray.c
@@ -728,7 +728,7 @@ static noinline void *test_get_entry(str
 {
 	XA_STATE(xas, xa, index);
 	void *p;
-	static unsigned int i = 0;
+	unsigned int loops = 0;
 
 	rcu_read_lock();
 repeat:
@@ -746,7 +746,7 @@ repeat:
 	 * APIs won't be stupid, proper page cache APIs loop over the proper
 	 * order so when using a larger order we skip shared entries.
 	 */
-	if (++i % XA_CHECK_SCHED == 0)
+	if (++loops % XA_CHECK_SCHED == 0)
 		schedule();
 
 	return p;
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

test_xarray-add-tests-for-advanced-multi-index-use.patch
test_xarray-add-tests-for-advanced-multi-index-use-fix-fix-fix.patch
kexec-split-crashkernel-reservation-code-out-from-crash_corec-fix.patch
arch-crash-move-arch_crash_save_vmcoreinfo-out-to-file-vmcore_infoc-fix.patch
mm-swapfile-__swap_duplicate-drop-redundant-write_once-on-swap_map-for-err-cases-fix.patch
kprobes-use-synchronize_rcu_tasks_rude-in-kprobe_optimizer-fix.patch
panic-add-option-to-dump-blocked-tasks-in-panic_print-fix.patch