From 39526901197618e7f451ecac6101eb45553395c8400c908de9bde26356055721 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Fri, 18 Oct 2024 15:42:04 +0200
Subject: [PATCH] Sync from SUSE:SLFO:Main ndctl revision
 ab9c8d248f2c69f67ab21b485dfe083d

---
 cxl-json-Fix-tracefs-include.patch | 35 ++++++++++++++++++++++++++++++
 ndctl-79.tar.gz                    |  3 ---
 ndctl-80.tar.gz                    |  3 +++
 ndctl.changes                      | 10 +++++++++
 ndctl.spec                         |  3 ++-
 5 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 cxl-json-Fix-tracefs-include.patch
 delete mode 100644 ndctl-79.tar.gz
 create mode 100644 ndctl-80.tar.gz

diff --git a/cxl-json-Fix-tracefs-include.patch b/cxl-json-Fix-tracefs-include.patch
new file mode 100644
index 0000000..e791ece
--- /dev/null
+++ b/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
+
diff --git a/ndctl-79.tar.gz b/ndctl-79.tar.gz
deleted file mode 100644
index fc41caf..0000000
--- a/ndctl-79.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c4c4e698c38ba8be4c08f3a9554cca3db8e71db1ace13906e3f8490db13418f0
-size 433747
diff --git a/ndctl-80.tar.gz b/ndctl-80.tar.gz
new file mode 100644
index 0000000..6be4f71
--- /dev/null
+++ b/ndctl-80.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4bb7565feea486997a0f62b1878aeb6d4db9af128e0fa459359b3c02644325c5
+size 436958
diff --git a/ndctl.changes b/ndctl.changes
index 6f4eb21..0f09cb0 100644
--- a/ndctl.changes
+++ b/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>
 
diff --git a/ndctl.spec b/ndctl.spec
index 6ce71fa..0d577be 100644
--- a/ndctl.spec
+++ b/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