Torture-test updates for v6.2

[kernel-patches-bot]

Pull request for series with
subject: Torture-test updates for v6.2
version: 3
url: https://patchwork.kernel.org/project/rcu/list/?series=686919

[kernel-patches-bot]

Master branch: 00c153b
series: https://patchwork.kernel.org/project/rcu/list/?series=686919
version: 3

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/rcu/list/?series=686919
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am -3
  stdout: 'Applying: rcutorture: Verify NUM_ACTIVE_RCU_POLL_FULL_OLDSTATE
Using index info to reconstruct a base tree...
M	kernel/rcu/rcutorture.c
Falling back to patching base and 3-way merge...
Auto-merging kernel/rcu/rcutorture.c
CONFLICT (content): Merge conflict in kernel/rcu/rcutorture.c
Patch failed at 0001 rcutorture: Verify NUM_ACTIVE_RCU_POLL_FULL_OLDSTATE
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

conflict:

diff --cc kernel/rcu/rcutorture.c
index 684e24f12a79,b6885767ce46..000000000000
--- a/kernel/rcu/rcutorture.c
+++ b/kernel/rcu/rcutorture.c
@@@ -357,9 -357,7 +357,13 @@@ struct rcu_torture_ops 
  	bool (*poll_gp_state_exp)(unsigned long oldstate);
  	void (*cond_sync_exp)(unsigned long oldstate);
  	void (*cond_sync_exp_full)(struct rcu_gp_oldstate *rgosp);
++<<<<<<< HEAD
 +	unsigned long (*get_comp_state)(void);
  	void (*get_comp_state_full)(struct rcu_gp_oldstate *rgosp);
 +	bool (*same_gp_state)(unsigned long oldstate1, unsigned long oldstate2);
++=======
++	void (*get_comp_state_full)(struct rcu_gp_oldstate *rgosp);
++>>>>>>> rcutorture: Verify NUM_ACTIVE_RCU_POLL_FULL_OLDSTATE
  	bool (*same_gp_state_full)(struct rcu_gp_oldstate *rgosp1, struct rcu_gp_oldstate *rgosp2);
  	unsigned long (*get_gp_state)(void);
  	void (*get_gp_state_full)(struct rcu_gp_oldstate *rgosp);
@@@ -539,9 -537,7 +543,13 @@@ static struct rcu_torture_ops rcu_ops 
  	.deferred_free		= rcu_torture_deferred_free,
  	.sync			= synchronize_rcu,
  	.exp_sync		= synchronize_rcu_expedited,
++<<<<<<< HEAD
 +	.same_gp_state		= same_state_synchronize_rcu,
 +	.same_gp_state_full	= same_state_synchronize_rcu_full,
 +	.get_comp_state		= get_completed_synchronize_rcu,
++=======
+ 	.same_gp_state_full	= same_state_synchronize_rcu_full,
++>>>>>>> rcutorture: Verify NUM_ACTIVE_RCU_POLL_FULL_OLDSTATE
  	.get_comp_state_full	= get_completed_synchronize_rcu_full,
  	.get_gp_state		= get_state_synchronize_rcu,
  	.get_gp_state_full	= get_state_synchronize_rcu_full,