Merging upstream version 2.13.

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

plugins/meson.build

@@ -1,12 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-if json_c_dep.found()
-  sources += [
-    'plugins/solidigm/solidigm-nvme.c',
-  ]
-  subdir('solidigm')
-endif
-
 sources += [
   'plugins/amzn/amzn-nvme.c',
   'plugins/dapustor/dapustor-nvme.c',
@@ -22,6 +15,8 @@ sources += [
   'plugins/nbft/nbft-plugin.c',
   'plugins/netapp/netapp-nvme.c',
   'plugins/nvidia/nvidia-nvme.c',
+  'plugins/sandisk/sandisk-nvme.c',
+  'plugins/sandisk/sandisk-utils.c',
   'plugins/scaleflux/sfx-nvme.c',
   'plugins/seagate/seagate-nvme.c',
   'plugins/shannon/shannon-nvme.c',
@@ -35,9 +30,14 @@ sources += [
   'plugins/zns/zns.c',
 ]
 
-subdir('ocp')
+subdir('feat')
 subdir('lm')
+subdir('ocp')
 
 if conf.get('HAVE_SED_OPAL') != 0
   subdir('sed')
 endif
+
+if json_c_dep.found()
+  subdir('solidigm')
+endif