diff -Nru lttng-modules-2.13.8/debian/changelog lttng-modules-2.13.8/debian/changelog --- lttng-modules-2.13.8/debian/changelog 2023-01-16 16:47:18.000000000 +0000 +++ lttng-modules-2.13.8/debian/changelog 2023-04-20 09:20:21.000000000 +0000 @@ -1,3 +1,9 @@ +lttng-modules (2.13.8-1ubuntu1) lunar; urgency=medium + + * Fix jbd2 build (LP: #2017006) + + -- Roxana Nicolescu Thu, 20 Apr 2023 09:20:21 +0000 + lttng-modules (2.13.8-1) unstable; urgency=medium * [813bc03] New upstream version 2.13.8 diff -Nru lttng-modules-2.13.8/debian/control lttng-modules-2.13.8/debian/control --- lttng-modules-2.13.8/debian/control 2022-10-19 18:41:30.000000000 +0000 +++ lttng-modules-2.13.8/debian/control 2023-04-20 09:20:21.000000000 +0000 @@ -1,7 +1,8 @@ Source: lttng-modules Section: kernel Priority: optional -Maintainer: Jon Bernard +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Jon Bernard Uploaders: Michael Jeanson Build-Depends: debhelper-compat (= 12), dh-sequence-dkms Standards-Version: 4.6.0.1 diff -Nru lttng-modules-2.13.8/debian/patches/fix_jbd2_functions.patch lttng-modules-2.13.8/debian/patches/fix_jbd2_functions.patch --- lttng-modules-2.13.8/debian/patches/fix_jbd2_functions.patch 1970-01-01 00:00:00.000000000 +0000 +++ lttng-modules-2.13.8/debian/patches/fix_jbd2_functions.patch 2023-04-20 09:20:21.000000000 +0000 @@ -0,0 +1,28 @@ +Index: lttng-modules-2.13.8/include/instrumentation/events/jbd2.h +=================================================================== +--- lttng-modules-2.13.8.orig/include/instrumentation/events/jbd2.h ++++ lttng-modules-2.13.8/include/instrumentation/events/jbd2.h +@@ -29,6 +29,7 @@ LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint, + + #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ + || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ ++ || LTTNG_KERNEL_RANGE(5,19,0, 5,19,19) \ + || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ + || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) + LTTNG_TRACEPOINT_EVENT_CLASS(jbd2_commit, +@@ -97,6 +98,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd2_com + + #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ + || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ ++ || LTTNG_KERNEL_RANGE(5,19,0, 5,19,19) \ + || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ + || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) + LTTNG_TRACEPOINT_EVENT(jbd2_end_commit, +@@ -139,6 +141,7 @@ LTTNG_TRACEPOINT_EVENT(jbd2_submit_inode + + #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ + || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ ++ || LTTNG_KERNEL_RANGE(5,19,0, 5,19,19) \ + || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ + || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) + LTTNG_TRACEPOINT_EVENT(jbd2_run_stats, diff -Nru lttng-modules-2.13.8/debian/patches/series lttng-modules-2.13.8/debian/patches/series --- lttng-modules-2.13.8/debian/patches/series 2022-06-01 14:36:39.000000000 +0000 +++ lttng-modules-2.13.8/debian/patches/series 2023-04-20 09:20:21.000000000 +0000 @@ -1 +1,2 @@ fix-linux-rt-4.9-sched.patch +fix_jbd2_functions.patch