Merging upstream version 1.10.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 8 insertions, 8 deletions

diff --git a/test/sysfs/data/nvme-sysfs-tw-carbon-6.8.0-rc1+.out b/test/sysfs/data/tree-pcie.out
index 1cb6de4..4a755a7 100644
--- a/test/sysfs/data/nvme-sysfs-tw-carbon-6.8.0-rc1+.out
+++ b/test/sysfs/data/tree-pcie.out
@@ -5,24 +5,24 @@
       "hostid":"ce4fee3e-c02c-11ee-8442-830d068a36c6",
       "subsystems":[
         {
-          "name":"nvme-subsys1",
-          "nqn":"nqn.2019-08.org.qemu:nvme-0",
+          "name":"nvme-subsys0",
+          "nqn":"nqn.2019-08.org.qemu:subsys1",
           "controllers":[
             {
-              "name":"nvme1",
+              "name":"nvme0",
               "transport":"pcie",
-              "traddr":"0000:00:05.0"
+              "traddr":"0000:0f:00.0"
             }
           ]
         },
         {
-          "name":"nvme-subsys0",
-          "nqn":"nqn.2019-08.org.qemu:subsys1",
+          "name":"nvme-subsys1",
+          "nqn":"nqn.2019-08.org.qemu:nvme-0",
           "controllers":[
             {
-              "name":"nvme0",
+              "name":"nvme1",
               "transport":"pcie",
-              "traddr":"0000:0f:00.0"
+              "traddr":"0000:00:05.0"
             }
           ]
         }
diff --git a/test/sysfs/data/nvme-sysfs-tw-carbon-6.8.0-rc1+.tar.xz b/test/sysfs/data/tree-pcie.tar.xz
index ee11fde..ee11fde 100644
--- a/test/sysfs/data/nvme-sysfs-tw-carbon-6.8.0-rc1+.tar.xz
+++ b/test/sysfs/data/tree-pcie.tar.xz