Merge branch 'fixes' of https://github.com/mwilck/nvme-cli into mwilck-fixes

diff --cc Makefile
index 084961a7601425fed3d5f28580bef4157499106a,0eaedb638e6a2813a5e219fd9cdfb3d93233f04c..4cf4c7a9d20cc9b4799dde98d6031d68d1b7287c
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -68,10 -62,8 +68,11 @@@ OBJS := nvme-print.o nvme-ioctl.o nvme-
        nvme-lightnvm.o fabrics.o nvme-models.o plugin.o \
        nvme-status.o nvme-filters.o nvme-topology.o
  
- UTIL_OBJS := util/argconfig.o util/suffix.o util/parser.o
 -UTIL_OBJS := util/argconfig.o util/suffix.o util/json.o util/parser.o \
++UTIL_OBJS := util/argconfig.o util/suffix.o util/parser.o \
+       util/cleanup.o util/log.o
 +ifneq ($(LIBJSONC), 0)
 +override UTIL_OBJS += util/json.o
 +endif
  
  PLUGIN_OBJS :=                                        \
        plugins/intel/intel-nvme.o              \

diff --cc fabrics.c
Simple merge

diff --cc nvme-topology.c
Simple merge

diff --cc nvme.c
Simple merge

diff --cc nvme.h
Simple merge