# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1662062990 -7200
# Node ID 346c888c242eca43d1242c8890827d860aec4cae
# Parent  dbc8c17a4f81651cccb8346d59ea900e205eb9c8# Parent  a0c986f931a295ba7c8ea651c159fcaba0613937
Merged concurrent changes.

diff -r dbc8c17a4f81 -r 346c888c242e conf/dstest_block_client.cfg
diff -r dbc8c17a4f81 -r 346c888c242e conf/dstest_block_client.list
diff -r dbc8c17a4f81 -r 346c888c242e conf/dstest_block_client_simple.cfg
diff -r dbc8c17a4f81 -r 346c888c242e conf/dstest_block_client_simple.list
diff -r dbc8c17a4f81 -r 346c888c242e conf/dstest_ext2fs_client.cfg
diff -r dbc8c17a4f81 -r 346c888c242e conf/dstest_ext2fs_client.list
diff -r dbc8c17a4f81 -r 346c888c242e conf/dstest_file_client.cfg
diff -r dbc8c17a4f81 -r 346c888c242e conf/dstest_file_client.list
diff -r dbc8c17a4f81 -r 346c888c242e conf/dstest_fsaccess.list
--- a/conf/dstest_fsaccess.list	Thu Sep 01 21:52:41 2022 +0200
+++ b/conf/dstest_fsaccess.list	Thu Sep 01 22:09:50 2022 +0200
@@ -1,6 +1,6 @@
-entry dstest_fsaccess
-roottask moe rom/dstest_fsaccess.cfg
-module dstest_fsaccess.cfg
+entry fsaccess
+roottask moe rom/fsaccess.cfg
+module fsaccess.cfg
 module e2test.fs
 module fsaccess.txt
 module l4re
diff -r dbc8c17a4f81 -r 346c888c242e conf/dstest_host_client.cfg
diff -r dbc8c17a4f81 -r 346c888c242e conf/dstest_host_client.list
diff -r dbc8c17a4f81 -r 346c888c242e conf/dstest_pipe_client.cfg
diff -r dbc8c17a4f81 -r 346c888c242e conf/dstest_pipe_client.list
diff -r dbc8c17a4f81 -r 346c888c242e conf/dstest_test_client.cfg
diff -r dbc8c17a4f81 -r 346c888c242e conf/dstest_test_client.list