Merging upstream version 1.10.

Signed-off-by: Daniel Baumann <daniel@debian.org>

test/meson.build

@@ -66,6 +66,15 @@ uuid = executable(
 
 test('uuid', uuid)
 
+uriparser = executable(
+    'test-uriparser',
+    ['uriparser.c'],
+    dependencies: libnvme_dep,
+    include_directories: [incdir, internal_incdir]
+)
+
+test('uriparser', uriparser)
+
 if conf.get('HAVE_NETDB')
     mock_ifaddrs = library(
         'mock-ifaddrs',
@@ -99,5 +108,6 @@ subdir('ioctl')
 subdir('nbft')
 
 if json_c_dep.found()
-  subdir('sysfs')
+    subdir('sysfs')
+    subdir('config')
 endif