From: Boqun Feng <boqun.feng@gmail.com>
Date: Wed, 5 Mar 2025 02:47:32 +0000 (-0800)
Subject: Merge branches 'docs.2025.02.04a', 'lazypreempt.2025.03.04a', 'misc.2025.03.04a'... 
X-Git-Tag: v6.15-rc1~221^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=467c890f2d1ad6de9fd1dbd196fdc8f3ee63190a;p=thirdparty%2Fkernel%2Flinux.git

Merge branches 'docs.2025.02.04a', 'lazypreempt.2025.03.04a', 'misc.2025.03.04a', 'srcu.2025.02.05a' and 'torture.2025.02.05a'
---

467c890f2d1ad6de9fd1dbd196fdc8f3ee63190a
diff --cc kernel/rcu/rcutorture.c
index d26fb1d33ed9a,4cae119dece80,726c2d63ab66f,1bd3eaa0b8e7a,be4e3c6b912fe..65095664f5c5b
--- a/kernel/rcu/rcutorture.c
+++ b/kernel/rcu/rcutorture.c
@@@@@@ -677,8 -677,8 -678,8 -677,9 -687,10 +688,11 @@@@@@ static void srcu_get_gp_data(int *flags
     static int srcu_torture_read_lock(void)
     {
     	int idx;
+++ +	struct srcu_ctr __percpu *scp;
     	int ret = 0;
     
++++ 	WARN_ON_ONCE(reader_flavor & ~SRCU_READ_FLAVOR_ALL);
++++ 
     	if ((reader_flavor & SRCU_READ_FLAVOR_NORMAL) || !(reader_flavor & SRCU_READ_FLAVOR_ALL)) {
     		idx = srcu_read_lock(srcu_ctlp);
     		WARN_ON_ONCE(idx & ~0x1);