Merge latest changes from master branch

diff --cc src/Makefile
index 06a4ad34cf65781a49435bb1446b07cc95de3fe4,2c9b996b75885225d1940fa0f0e30cba54af7f35..a4c33dababc4921fb99c892ac39f026fc5507f5c
--- 1/src/Makefile
--- 2/src/Makefile
+++ b/src/Makefile
@@@ -49,7 -49,8 +49,7 @@@ $(libccan_objs) $(libccan_sobjs): $(lib
  libnvme_priv := nvme/private.h
  libnvme_api := libnvme.h nvme/types.h nvme/ioctl.h nvme/filters.h nvme/tree.h nvme/util.h nvme/fabrics.h
  libnvme_srcs := nvme/ioctl.c nvme/filters.c nvme/fabrics.c nvme/util.c nvme/tree.c nvme/log.c nvme/cleanup.c
- ifneq ($(CONFIG_JSONC),0)
 -libnvme_swig := nvme/libnvme.i
+ ifeq ($(CONFIG_JSONC),y)
  override libnvme_srcs += nvme/json.c
  endif
  libnvme_objs := $(patsubst %.c,%.ol,$(libnvme_srcs))