diff -Nru lttng-modules-2.10.5/debian/changelog lttng-modules-2.10.5/debian/changelog --- lttng-modules-2.10.5/debian/changelog 2018-01-30 16:35:18.000000000 -0500 +++ lttng-modules-2.10.5/debian/changelog 2018-03-23 10:20:08.000000000 -0400 @@ -1,3 +1,10 @@ +lttng-modules (2.10.5-1ubuntu1) bionic; urgency=medium + + * Fix builds for 4.13.0-38 kernel (LP: #1756240) + - Update definition of kvm_mmio() to match the new kernel + + -- Khalid Elmously Fri, 23 Mar 2018 10:20:08 -0400 + lttng-modules (2.10.5-1) unstable; urgency=medium * [a2c04be] Switched my uploader email to @debian.org diff -Nru lttng-modules-2.10.5/debian/control lttng-modules-2.10.5/debian/control --- lttng-modules-2.10.5/debian/control 2018-01-30 16:15:19.000000000 -0500 +++ lttng-modules-2.10.5/debian/control 2018-03-23 10:20:08.000000000 -0400 @@ -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 (>= 9), dkms (>= 2.1.0.0), dpkg-dev (>= 1.16.1) Standards-Version: 4.1.3 diff -Nru lttng-modules-2.10.5/debian/patches/0002-Update-kvm-instrumentation-for-ubuntu-kernel-4.13.0-38+.patch lttng-modules-2.10.5/debian/patches/0002-Update-kvm-instrumentation-for-ubuntu-kernel-4.13.0-38+.patch --- lttng-modules-2.10.5/debian/patches/0002-Update-kvm-instrumentation-for-ubuntu-kernel-4.13.0-38+.patch 1969-12-31 19:00:00.000000000 -0500 +++ lttng-modules-2.10.5/debian/patches/0002-Update-kvm-instrumentation-for-ubuntu-kernel-4.13.0-38+.patch 2018-03-23 10:20:08.000000000 -0400 @@ -0,0 +1,13 @@ +Description: Update kvm.h for 4.13.0-38 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1756240 +Author: Khalid Elmously +--- lttng-modules-2.10.5.orig/instrumentation/events/lttng-module/kvm.h ++++ lttng-modules-2.10.5/instrumentation/events/lttng-module/kvm.h +@@ -91,6 +91,7 @@ LTTNG_TRACEPOINT_EVENT(kvm_ack_irq, + || LTTNG_KERNEL_RANGE(4,4,112, 4,5,0) \ + || LTTNG_KERNEL_RANGE(3,16,52, 3,17,0) \ + || LTTNG_KERNEL_RANGE(3,2,97, 3,3,0) \ ++ || LTTNG_UBUNTU_KERNEL_RANGE(4,13,16,38, 4,14,255,255) \ + || LTTNG_DEBIAN_KERNEL_RANGE(4,9,65,0,3,0, 4,10,0,0,0,0)) + + LTTNG_TRACEPOINT_EVENT(kvm_mmio, diff -Nru lttng-modules-2.10.5/debian/patches/series lttng-modules-2.10.5/debian/patches/series --- lttng-modules-2.10.5/debian/patches/series 2018-01-30 16:35:14.000000000 -0500 +++ lttng-modules-2.10.5/debian/patches/series 2018-03-23 10:20:08.000000000 -0400 @@ -1,2 +1,3 @@ fix-linux-rt-4.9-sched.patch 0001-Update-kvm-instrumentation-for-debian-kernel-4.14.0-.patch +0002-Update-kvm-instrumentation-for-ubuntu-kernel-4.13.0-38+.patch