selftests: ublk: move test temp files into a sub directory

[blktests-ci]

Pull request for series with
subject: selftests: ublk: move test temp files into a sub directory
version: 1
url: https://patchwork.kernel.org/project/linux-block/list/?series=1048367

[blktests-ci]

Upstream branch: 8dfce89
series: https://patchwork.kernel.org/project/linux-block/list/?series=1048367
version: 1

[blktests-ci]

Upstream branch: de0674d
series: https://patchwork.kernel.org/project/linux-block/list/?series=1048367
version: 1

[blktests-ci]

Upstream branch: f14faaf
series: https://patchwork.kernel.org/project/linux-block/list/?series=1048367
version: 1

[blktests-ci]

Upstream branch: b7ff715
series: https://patchwork.kernel.org/project/linux-block/list/?series=1048367
version: 1

[blktests-ci]

Upstream branch: e7aa572
series: https://patchwork.kernel.org/project/linux-block/list/?series=1048367
version: 1

[blktests-ci]

Upstream branch: 05f7e89
series: https://patchwork.kernel.org/project/linux-block/list/?series=1048367
version: 1

[blktests-ci]

Upstream branch: c22e26b
series: https://patchwork.kernel.org/project/linux-block/list/?series=1048367
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-block/list/?series=1048367
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: selftests: ublk: move test temp files into a sub directory
Using index info to reconstruct a base tree...
M	tools/testing/selftests/ublk/test_common.sh
Falling back to patching base and 3-way merge...
Auto-merging tools/testing/selftests/ublk/test_common.sh
CONFLICT (content): Merge conflict in tools/testing/selftests/ublk/test_common.sh
Patch failed at 0001 selftests: ublk: move test temp files into a sub directory'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"'

conflict:

diff --cc tools/testing/selftests/ublk/test_common.sh
index 163a40007910,46983ccf5c1a..000000000000
--- a/tools/testing/selftests/ublk/test_common.sh
+++ b/tools/testing/selftests/ublk/test_common.sh
@@@ -129,12 -119,10 +129,17 @@@ _prep_test() 
  	local type=$1
  	shift 1
  	modprobe ublk_drv > /dev/null 2>&1
++<<<<<<< HEAD
 +	local base_dir=${TMPDIR:-./ublktest-dir}
 +	mkdir -p "$base_dir"
 +	UBLK_TEST_DIR=$(mktemp -d ${base_dir}/${TID}.XXXXXX)
++=======
+ 	TDIR=$(mktemp -d ${TMPDIR:-.}/ublktest-dir.XXXXXX)
+ 	export UBLK_TEST_DIR=${TDIR}
++>>>>>>> selftests: ublk: move test temp files into a sub directory
  	UBLK_TMP=$(mktemp ${UBLK_TEST_DIR}/ublk_test_XXXXX)
  	[ "$UBLK_TEST_QUIET" -eq 0 ] && echo "ublk $type: $*"
 +	echo "ublk selftest: $TID starting at $(date '+%F %T')" | tee /dev/kmsg
  }
  
  _remove_test_files()
@@@ -185,7 -168,6 +190,10 @@@ _cleanup_test() 
  
  	_remove_files
  	rmdir ${UBLK_TEST_DIR}
++<<<<<<< HEAD
 +	echo "ublk selftest: $TID done at $(date '+%F %T')" | tee /dev/kmsg
++=======
++>>>>>>> selftests: ublk: move test temp files into a sub directory
  }
  
  _have_feature()