Sync from SUSE:SLFO:Main ndctl revision ab9c8d248f2c69f67ab21b485dfe083d

cxl-json-Fix-tracefs-include.patch

@@ -0,0 +1,35 @@
+From e2a496c150a80964fb39f462b13474ee2ca14d81 Mon Sep 17 00:00:00 2001
+From: Michal Suchanek <msuchanek@suse.de>
+Date: Thu, 10 Oct 2024 19:15:00 +0200
+Subject: [PATCH] cxl/json: Fix tracefs include.
+
+../cxl/json.c:12:10: fatal error: tracefs/tracefs.h: No such file or
+directory
+
+pkg-config --cflags libtracefs
+-I/usr/include/libtracefs -I/usr/include/traceevent
+
+find /usr/include/ -name tracefs.h
+/usr/include/libtracefs/tracefs.h
+
+Signed-off-by: Michal Suchanek <msuchanek@suse.de>
+---
+ cxl/json.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cxl/json.c b/cxl/json.c
+index 5066d3bed13f..e65bd803b706 100644
+--- a/cxl/json.c
++++ b/cxl/json.c
+@@ -9,7 +9,7 @@
+ #include <json-c/json.h>
+ #include <json-c/printbuf.h>
+ #include <ccan/short_types/short_types.h>
+-#include <tracefs/tracefs.h>
++#include <tracefs.h>
+ 
+ #include "filter.h"
+ #include "json.h"
+-- 
+2.46.1
+

ndctl.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Oct 10 17:01:07 UTC 2024 - Michal Suchanek <msuchanek@suse.com>
+
+- Update to version 80
+  * cxl-list: add --media-errors option
+  * cxl-list: always emit memdev firmware revision
+  * daxctl: fail create-device with extra parameters
+  * daxctl: remove unused options from create-device usage message
+- cxl-json-Fix-tracefs-include.patch
+
 -------------------------------------------------------------------
 Thu May 30 09:46:50 UTC 2024 - ming li <mli@suse.com>
 

ndctl.spec

@@ -25,7 +25,7 @@
 %define lname libndctl6
 %define dname libndctl-devel
 Name:           ndctl
-Version:        79
+Version:        80
 Release:        0
 Summary:        Manage "libnvdimm" subsystem devices (Non-volatile Memory)
 License:        GPL-2.0-only
@@ -34,6 +34,7 @@ URL:            https://github.com/pmem/ndctl
 Source0:        https://github.com/pmem/ndctl/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        ndctl-rpmlintrc
 Patch0:         harden_ndctl-monitor.service.patch
+Patch1:         cxl-json-Fix-tracefs-include.patch
 BuildRequires:  keyutils-devel
 BuildRequires:  libiniparser-devel
 BuildRequires:  libtool