From: Martin Belanger <martin.belanger@dell.com>
Date: Fri, 23 Jul 2021 19:39:29 +0000 (-0400)
Subject: Merge latest changes from master branch
X-Git-Tag: v1.0-rc0~116^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bf6048f6605798d314f9dc31c6a24b550f58d8dc;p=users%2Fsagi%2Flibnvme.git

Merge latest changes from master branch
---

bf6048f6605798d314f9dc31c6a24b550f58d8dc
diff --cc src/Makefile
index 06a4ad34,2c9b996b..a4c33dab
--- a/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))