linux-next: manual merge of the paulmck tree with the rcu tree
From: Mark Brown
Date: Tue Nov 17 2026 - 17:44:37 EST
Hi all,
Today's linux-next merge of the paulmck tree got a conflict in:
tools/testing/selftests/rcutorture/bin/torture.sh
between commit:
7ada0a57267ab ("torture: Use ${:+} to save a few lines in torture.sh's torture_one()")
from the rcu tree and commit:
436f3c6b27de8 ("torture.sh: Add hazptr torturing")
from the paulmck tree. AFAICT the change in the hazptr commit is adding
quoting that is also covered by the other commit and should have been
redundant anyway but you really want to double check here.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
diff --combined tools/testing/selftests/rcutorture/bin/torture.sh
index 1b7ad2c15e1ed,90b5e113a0b03..0000000000000
--- a/tools/testing/selftests/rcutorture/bin/torture.sh
+++ b/tools/testing/selftests/rcutorture/bin/torture.sh
@@@ -43,10 -43,11 +43,11 @@@ f
configs_rcutorture=
configs_locktorture=
configs_scftorture=
+ configs_hazptr=
kcsan_kmake_args=
# Default compression, duration, and apportionment.
-compress_concurrency="`identify_qemu_vcpus`"
+compress_concurrency="${TORTURE_ALLOTED_CPUS}"
duration_base=10
duration_rcutorture_frac=7
duration_locktorture_frac=1
@@@ -70,6 -71,7 +71,7 @@@ do_rcutasksflavors="${ifnotaarch64}" #
do_srcu_lockdep=yes
do_atomic_srcu=yes
do_rcu_rust=no
+ do_hazptr=yes
# doyesno - Helper function for yes/no arguments
function doyesno () {
@@@ -90,6 -92,7 +92,7 @@@ usage ()
echo " --do-all"
echo " --do-allmodconfig / --do-no-allmodconfig / --no-allmodconfig"
echo " --do-clocksourcewd / --do-no-clocksourcewd / --no-clocksourcewd"
+ echo " --do-hazptr / --do-no-hazptr / --no-hazptr"
echo " --do-kasan / --do-no-kasan / --no-kasan"
echo " --do-kcsan / --do-no-kcsan / --no-kcsan"
echo " --do-kvfree / --do-no-kvfree / --no-kvfree"
@@@ -119,6 -122,11 +122,11 @@@ d
compress_concurrency=$2
shift
;;
+ --config-hazptr|--configs-hazptr)
+ checkarg --configs-hazptr "(list of config files)" "$#" "$2" '^[^/]\+$' '^--'
+ configs_hazptr="$configs_hazptr $2"
+ shift
+ ;;
--config-rcutorture|--configs-rcutorture)
checkarg --configs-rcutorture "(list of config files)" "$#" "$2" '^[^/]\+$' '^--'
configs_rcutorture="$configs_rcutorture $2"
@@@ -149,6 -157,7 +157,7 @@@
do_kasan=yes
do_kcsan=yes
do_clocksourcewd="${ifnotaarch64}"
+ do_hazptr=yes
do_srcu_lockdep=yes
do_atomic_srcu=yes
;;
@@@ -158,6 -167,9 +167,9 @@@
--do-clocksourcewd|--do-no-clocksourcewd|--no-clocksourcewd)
do_clocksourcewd=`doyesno "$1" --do-clocksourcewd`
;;
+ --do-hazptr|--do-no-hazptr|--no-hazptr)
+ do_hazptr=`doyesno "$1" --do-hazptr`
+ ;;
--do-kasan|--do-no-kasan|--no-kasan)
do_kasan=`doyesno "$1" --do-kasan`
;;
@@@ -185,6 -197,7 +197,7 @@@
do_kasan=no
do_kcsan=no
do_clocksourcewd=no
+ do_hazptr=no
do_srcu_lockdep=no
do_atomic_srcu=no
;;
@@@ -341,8 -354,16 +354,8 @@@ touch $T/successe
# Note that quoting is problematic. So on the command line, pass multiple
# values with multiple kvm.sh argument instances.
function torture_one {
- local cur_bootargs=
- local boottag=
-
echo " --- $curflavor:" Start `date` | tee -a $T/log
- if test -n "$torture_bootargs"
- then
- boottag="--bootargs"
- cur_bootargs="$torture_bootargs"
- fi
- "$@" "${boottag}" "$cur_bootargs" --datestamp "$ds/results-$curflavor" > $T/$curflavor.out 2>&1
+ "$@" ${torture_bootargs:+--bootargs "$torture_bootargs"} --datestamp "$ds/results-$curflavor" > $T/$curflavor.out 2>&1
retcode=$?
resdir="`grep '^Results directory: ' $T/$curflavor.out | tail -1 | sed -e 's/^Results directory: //'`"
if test -z "$resdir"
@@@ -720,6 -741,17 +733,17 @@@ the
fi
fi
+ # Calculate hazptr defaults and apportion time
+ if test -z "$configs_hazptr"
+ then
+ configs_hazptr=CFLIST
+ fi
+ if test "$do_hazptr" = "yes"
+ then
+ torture_bootargs=""
+ torture_set "hazptr" tools/testing/selftests/rcutorture/bin/kvm.sh --torture hazptr --allcpus --duration "$duration_rcutorture" --configs "$configs_hazptr" --trust-make
+ fi
+
echo " --- " $scriptname $args
echo " --- " Done `date` | tee -a $T/log
ret=0
Attachment:
signature.asc
Description: PGP signature