Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: lttng-modu...@packages.debian.org
Control: affects -1 + src:lttng-modules
Please unblock package lttng-modules
The 2.13.9 release currently in testing contains fixes to build against
the current 5.10.0-22 kernel in stable, keeping the current 2.13.8
release might result in a failed upgrade from bulllseye to bookworm.
[ Reason ]
The latest 5.10.0 kernel in stable results in a build failure with
2.13.8.
[ Impact ]
Potential failed upgrade to bookworm.
[ Tests ]
Manually tested with 5.10.0-22 and 6.1.0-5.
[ Risks ]
Low, this is a not widely used package and the changes between 2.13.8
and 2.13.9 are very targeted.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
unblock lttng-modules/2.13.9-1
diff -Nru lttng-modules-2.13.8/ChangeLog lttng-modules-2.13.9/ChangeLog
--- lttng-modules-2.13.8/ChangeLog 2023-01-13 16:08:06.000000000 -0500
+++ lttng-modules-2.13.9/ChangeLog 2023-03-03 10:39:24.000000000 -0500
@@ -1,3 +1,9 @@
+2023-03-03 (Canadian Bacon Day) LTTng modules 2.13.9
+ * fix: jbd2: use the correct print format (v5.4.229)
+ * fix: jbd2 upper bound for v5.10.163
+ * fix: jbd2: use the correct print format (v5.10.163)
+ * fix: btrfs: move accessor helpers into accessors.h (v6.2)
+
2023-01-13 (National Sticker Day) LTTng modules 2.13.8
* fix: jbd2: use the correct print format
* Fix: in_x32_syscall was introduced in v4.7.0
diff -Nru lttng-modules-2.13.8/debian/changelog
lttng-modules-2.13.9/debian/changelog
--- lttng-modules-2.13.8/debian/changelog 2023-01-16 11:47:18.000000000
-0500
+++ lttng-modules-2.13.9/debian/changelog 2023-03-07 14:12:32.000000000
-0500
@@ -1,3 +1,10 @@
+lttng-modules (2.13.9-1) unstable; urgency=medium
+
+ * [2f1b62b] New upstream version 2.13.9
+ - Bugfix release, adds support for v6.2 and multiple stable kernels.
+
+ -- Michael Jeanson <mjean...@debian.org> Tue, 07 Mar 2023 14:12:32 -0500
+
lttng-modules (2.13.8-1) unstable; urgency=medium
* [813bc03] New upstream version 2.13.8
diff -Nru lttng-modules-2.13.8/include/instrumentation/events/btrfs.h
lttng-modules-2.13.9/include/instrumentation/events/btrfs.h
--- lttng-modules-2.13.8/include/instrumentation/events/btrfs.h 2023-01-13
16:08:06.000000000 -0500
+++ lttng-modules-2.13.9/include/instrumentation/events/btrfs.h 2023-03-03
10:39:24.000000000 -0500
@@ -9,6 +9,10 @@
#include <linux/writeback.h>
#include <lttng/kernel-version.h>
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0))
+#include <../fs/btrfs/accessors.h>
+#endif
+
#ifndef _TRACE_BTRFS_DEF_
#define _TRACE_BTRFS_DEF_
struct btrfs_root;
diff -Nru lttng-modules-2.13.8/include/instrumentation/events/jbd2.h
lttng-modules-2.13.9/include/instrumentation/events/jbd2.h
--- lttng-modules-2.13.8/include/instrumentation/events/jbd2.h 2023-01-13
16:08:06.000000000 -0500
+++ lttng-modules-2.13.9/include/instrumentation/events/jbd2.h 2023-03-03
10:39:24.000000000 -0500
@@ -28,6 +28,8 @@
)
#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \
+ || LTTNG_KERNEL_RANGE(5,4,229, 5,5,0) \
+ || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \
|| LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \
|| LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \
|| LTTNG_KERNEL_RANGE(6,1,4, 6,2,0))
@@ -96,6 +98,8 @@
#endif
#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \
+ || LTTNG_KERNEL_RANGE(5,4,229, 5,5,0) \
+ || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \
|| LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \
|| LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \
|| LTTNG_KERNEL_RANGE(6,1,4, 6,2,0))
@@ -138,6 +142,8 @@
)
#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \
+ || LTTNG_KERNEL_RANGE(5,4,229, 5,5,0) \
+ || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \
|| LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \
|| LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \
|| LTTNG_KERNEL_RANGE(6,1,4, 6,2,0))
diff -Nru lttng-modules-2.13.8/include/lttng/tracer.h
lttng-modules-2.13.9/include/lttng/tracer.h
--- lttng-modules-2.13.8/include/lttng/tracer.h 2023-01-13 16:08:06.000000000
-0500
+++ lttng-modules-2.13.9/include/lttng/tracer.h 2023-03-03 10:39:24.000000000
-0500
@@ -28,7 +28,7 @@
#define LTTNG_MODULES_MAJOR_VERSION 2
#define LTTNG_MODULES_MINOR_VERSION 13
-#define LTTNG_MODULES_PATCHLEVEL_VERSION 8
+#define LTTNG_MODULES_PATCHLEVEL_VERSION 9
#define LTTNG_MODULES_EXTRAVERSION ""
#define LTTNG_VERSION_NAME "Nordicité"
