lttng-modules failed to build with N-OEM-6.10

[Po-Hsu Lin]

This DKMS failed to build with Noble OEM 6.10.0-1005

 Error! Bad return status for module build on kernel: 6.10.0-1005-oem (x86_64)
 Consult /var/lib/dkms/lttng-modules/2.13.11/build/make.log for more information.
 dpkg: error processing package lttng-modules-dkms (--configure):
  installed lttng-modules-dkms package post-installation script subprocess returned error exit status 10
 Setting up g++-x86-64-linux-gnu (4:13.2.0-7ubuntu1) ...
 Setting up gcc-multilib (4:13.2.0-7ubuntu1) ...
 Setting up g++-13 (13.2.0-23ubuntu4) ...
 Setting up g++ (4:13.2.0-7ubuntu1) ...
 update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode
 Setting up build-essential (12.10ubuntu1) ...
 Processing triggers for sgml-base (1.31) ...
 Processing triggers for libc-bin (2.39-0ubuntu8.2) ...
 Processing triggers for man-db (2.12.0-4build2) ...
 Setting up lttng-tools (2.13.11-2.1build4) ...
 Created symlink /etc/systemd/system/multi-user.target.wants/lttng-sessiond.service → /usr/lib/systemd/system/lttng-sessiond.service.

 Errors were encountered while processing:
  lttng-modules-dkms
 needrestart is being skipped since dpkg has failed
 W: --force-yes is deprecated, use one of the options starting with --allow instead.
 E: Sub-process /usr/bin/dpkg returned an error code (1)
 Running 'dkms status -m lttng-modules | grep installed'
 Running 'cat /var/lib/dkms/lttng-modules/*/build/make.log'
 DKMS make.log for lttng-modules-2.13.11 for kernel 6.10.0-1005-oem (x86_64)
 Fri Jun 21 22:08:42 UTC 2024
 make: Entering directory '/usr/src/linux-headers-6.10.0-1005-oem'
 warning: the compiler differs from the one used to build the kernel
   The kernel was built by: x86_64-linux-gnu-gcc-13 (Ubuntu 13.2.0-23ubuntu4) 13.2.0
   You are using: gcc-13 (Ubuntu 13.2.0-23ubuntu4) 13.2.0
 /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/Kbuild:27: File ./mm/slab.h not found. Probe "kmem" is disabled. Use full kernel source tree to enable it.
 /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/Kbuild:81: File ./arch/x86/kvm/lapic.h not found. Probe "kvm" x86-specific is disabled. Use full kernel source tree to enable it.
 /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/Kbuild:188: Files ./fs/btrfs/*.h not found. Probe "btrfs" is disabled. Use full kernel source tree to enable it.
 /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/Kbuild:207: Files ./mm/internal.h not found. Probe "compaction" is disabled. Use full kernel source tree to enable it.
 /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/Kbuild:216: Files ./fs/ext4/*.h not found. Probe "ext4" is disabled. Use full kernel source tree to enable it.
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/lib/ringbuffer/ring_buffer_backend.o
 /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/Kbuild:245: File ./drivers/base/regmap/trace.h not found. Probe "regmap" is disabled. Need Linux 4.1+ kernel source tree to enable it.
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/lttng-probe-sched.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/lib/ringbuffer/ring_buffer_frontend.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/lttng-probe-irq.o
 /var/lib/dkms/lttng-modules/2.13.11/build/src/lib/ringbuffer/ring_buffer_frontend.c:2409:12: warning: no previous prototype for ‘init_lib_ring_buffer_frontend’ [-Wmissing-prototypes]
  2409 | int __init init_lib_ring_buffer_frontend(void)
       | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 /var/lib/dkms/lttng-modules/2.13.11/build/src/lib/ringbuffer/ring_buffer_frontend.c:2420:13: warning: no previous prototype for ‘exit_lib_ring_buffer_frontend’ [-Wmissing-prototypes]
  2420 | void __exit exit_lib_ring_buffer_frontend(void)
       | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/lttng-probe-timer.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/lib/ringbuffer/ring_buffer_iterator.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/lttng-probe-module.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/lib/ringbuffer/ring_buffer_vfs.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/lttng-probe-power.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/lib/ringbuffer/ring_buffer_splice.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/lttng-probe-statedump.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/lib/ringbuffer/ring_buffer_mmap.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/lib/prio_heap/lttng_prio_heap.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/lib/../wrapper/splice.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/lttng-probe-9p.o
 /var/lib/dkms/lttng-modules/2.13.11/build/src/lib/../wrapper/splice.c:59:9: warning: no previous prototype for ‘wrapper_splice_to_pipe’ [-Wmissing-prototypes]
    59 | ssize_t wrapper_splice_to_pipe(struct pipe_inode_info *pipe,
       | ^~~~~~~~~~~~~~~~~~~~~~
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/lib/counter/counter.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/lttng-probe-i2c.o
   LD [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/lib/lttng-lib-ring-buffer.o
   LD [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/lib/lttng-counter.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/tests/probes/lttng-test.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/lttng-probe-kvm.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/tests/clock-plugin/lttng-clock-plugin-test.o
   LD [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/tests/lttng-test.o
   LD [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/tests/lttng-clock-plugin-test.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/lttng-ring-buffer-client-discard.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/lttng-probe-x86-irq-vectors.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/lttng-ring-buffer-client-overwrite.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/lttng-probe-x86-exceptions.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/lttng-probe-signal.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/lttng-ring-buffer-metadata-client.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/lttng-probe-block.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/lttng-ring-buffer-client-mmap-discard.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/lttng-ring-buffer-client-mmap-overwrite.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/lttng-probe-napi.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/lttng-ring-buffer-metadata-mmap-client.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/lttng-probe-skb.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/lttng-ring-buffer-event-notifier-client.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/lttng-probe-net.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/lttng-counter-client-percpu-32-modular.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/lttng-probe-sock.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/lttng-counter-client-percpu-64-modular.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/lttng-clock.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/lttng-probe-udp.o
 /var/lib/dkms/lttng-modules/2.13.11/build/src/lttng-clock.c:63:6: warning: no previous prototype for ‘lttng_clock_ref’ [-Wmissing-prototypes]
    63 | void lttng_clock_ref(void)
       | ^~~~~~~~~~~~~~~
 /var/lib/dkms/lttng-modules/2.13.11/build/src/lttng-clock.c:81:6: warning: no previous prototype for ‘lttng_clock_unref’ [-Wmissing-prototypes]
    81 | void lttng_clock_unref(void)
       | ^~~~~~~~~~~~~~~~~
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/lib/msgpack/msgpack.o
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/lttng-probe-asoc.o
 In file included from /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/../../include/lttng/define_trace.h:87,
                  from /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/../../include/instrumentation/events/udp.h:26,
                  from /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/lttng-probe-udp.c:27:
 /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/../../include/lttng/tracepoint-event-impl.h:133:6: error: conflicting types for ‘trace_udp_fail_queue_rcv_skb’; have ‘void(int, struct sock *)’
   133 | void trace_##_name(_proto);
       | ^~~~~~
 /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/../../include/lttng/tracepoint-event-impl.h:45:9: note: in expansion of macro ‘LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP’
    45 | LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(map, name, map, PARAMS(proto), PARAMS(args))
       | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/../../include/lttng/tracepoint-event-impl.h:87:9: note: in expansion of macro ‘LTTNG_TRACEPOINT_EVENT_MAP’
    87 | LTTNG_TRACEPOINT_EVENT_MAP(name, name, \
       | ^~~~~~~~~~~~~~~~~~~~~~~~~~
 /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/../../include/instrumentation/events/udp.h:11:1: note: in expansion of macro ‘LTTNG_TRACEPOINT_EVENT’
    11 | LTTNG_TRACEPOINT_EVENT(udp_fail_queue_rcv_skb,
       | ^~~~~~~~~~~~~~~~~~~~~~
 In file included from ./include/trace/events/udp.h:9,
                  from /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/lttng-probe-udp.c:18:
 ./include/linux/tracepoint.h:256:28: note: previous definition of ‘trace_udp_fail_queue_rcv_skb’ with type ‘void(int, struct sock *, struct sk_buff *)’
   256 | static inline void trace_##name(proto) \
       | ^~~~~~
 ./include/linux/tracepoint.h:434:9: note: in expansion of macro ‘__DECLARE_TRACE’
   434 | __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \
       | ^~~~~~~~~~~~~~~
 ./include/linux/tracepoint.h:568:9: note: in expansion of macro ‘DECLARE_TRACE’
   568 | DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
       | ^~~~~~~~~~~~~
 ./include/trace/events/udp.h:12:1: note: in expansion of macro ‘TRACE_EVENT’
    12 | TRACE_EVENT(udp_fail_queue_rcv_skb,
       | ^~~~~~~~~~~
 make[4]: *** [scripts/Makefile.build:244: /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/lttng-probe-udp.o] Error 1
 make[4]: *** Waiting for unfinished jobs....
   CC [M] /var/lib/dkms/lttng-modules/2.13.11/build/src/lttng-events.o
 /var/lib/dkms/lttng-modules/2.13.11/build/src/lttng-events.c:1720:33: warning: no previous prototype for ‘get_tracker’ [-Wmissing-prototypes]
  1720 | struct lttng_kernel_id_tracker *get_tracker(struct lttng_kernel_session *session,
       | ^~~~~~~~~~~
 In file included from /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/../../include/lttng/define_trace.h:87,
                  from /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/../../include/instrumentation/events/asoc.h:414,
                  from /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/lttng-probe-asoc.c:29:
 /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/../../include/lttng/tracepoint-event-impl.h:133:6: error: conflicting types for ‘trace_snd_soc_bias_level_start’; have ‘void(struct snd_soc_card *, int)’
   133 | void trace_##_name(_proto);
       | ^~~~~~
 /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/../../include/instrumentation/events/asoc.h:134:1: note: in expansion of macro ‘LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP’
   134 | LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_card, snd_soc_bias_level_start,
       | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 In file included from ./include/trace/events/asoc.h:9,
                  from /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/lttng-probe-asoc.c:20:
 ./include/linux/tracepoint.h:256:28: note: previous definition of ‘trace_snd_soc_bias_level_start’ with type ‘void(struct snd_soc_dapm_context *, int)’
   256 | static inline void trace_##name(proto) \
       | ^~~~~~
 ./include/linux/tracepoint.h:434:9: note: in expansion of macro ‘__DECLARE_TRACE’
   434 | __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \
       | ^~~~~~~~~~~~~~~
 ./include/linux/tracepoint.h:557:9: note: in expansion of macro ‘DECLARE_TRACE’
   557 | DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
       | ^~~~~~~~~~~~~
 ./include/trace/events/asoc.h:44:1: note: in expansion of macro ‘DEFINE_EVENT’
    44 | DEFINE_EVENT(snd_soc_dapm, snd_soc_bias_level_start,
       | ^~~~~~~~~~~~
 /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/../../include/lttng/tracepoint-event-impl.h:133:6: error: conflicting types for ‘trace_snd_soc_bias_level_done’; have ‘void(struct snd_soc_card *, int)’
   133 | void trace_##_name(_proto);
       | ^~~~~~
 /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/../../include/instrumentation/events/asoc.h:144:1: note: in expansion of macro ‘LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP’
   144 | LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_card, snd_soc_bias_level_done,
       | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ./include/linux/tracepoint.h:256:28: note: previous definition of ‘trace_snd_soc_bias_level_done’ with type ‘void(struct snd_soc_dapm_context *, int)’
   256 | static inline void trace_##name(proto) \
       | ^~~~~~
 ./include/linux/tracepoint.h:434:9: note: in expansion of macro ‘__DECLARE_TRACE’
   434 | __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \
       | ^~~~~~~~~~~~~~~
 ./include/linux/tracepoint.h:557:9: note: in expansion of macro ‘DECLARE_TRACE’
   557 | DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
       | ^~~~~~~~~~~~~
 ./include/trace/events/asoc.h:52:1: note: in expansion of macro ‘DEFINE_EVENT’
    52 | DEFINE_EVENT(snd_soc_dapm, snd_soc_bias_level_done,
       | ^~~~~~~~~~~~
 /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/../../include/lttng/tracepoint-event-impl.h:133:6: error: conflicting types for ‘trace_snd_soc_dapm_start’; have ‘void(struct snd_soc_card *)’
   133 | void trace_##_name(_proto);
       | ^~~~~~
 /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/../../include/instrumentation/events/asoc.h:165:1: note: in expansion of macro ‘LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP’
   165 | LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_basic, snd_soc_dapm_start,
       | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ./include/linux/tracepoint.h:256:28: note: previous definition of ‘trace_snd_soc_dapm_start’ with type ‘void(struct snd_soc_card *, int)’
   256 | static inline void trace_##name(proto) \
       | ^~~~~~
 ./include/linux/tracepoint.h:434:9: note: in expansion of macro ‘__DECLARE_TRACE’
   434 | __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \
       | ^~~~~~~~~~~~~~~
 ./include/linux/tracepoint.h:557:9: note: in expansion of macro ‘DECLARE_TRACE’
   557 | DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
       | ^~~~~~~~~~~~~
 ./include/trace/events/asoc.h:79:1: note: in expansion of macro ‘DEFINE_EVENT’
    79 | DEFINE_EVENT(snd_soc_dapm_basic, snd_soc_dapm_start,
       | ^~~~~~~~~~~~
 /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/../../include/lttng/tracepoint-event-impl.h:133:6: error: conflicting types for ‘trace_snd_soc_dapm_done’; have ‘void(struct snd_soc_card *)’
   133 | void trace_##_name(_proto);
       | ^~~~~~
 /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/../../include/instrumentation/events/asoc.h:175:1: note: in expansion of macro ‘LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP’
   175 | LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_basic, snd_soc_dapm_done,
       | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ./include/linux/tracepoint.h:256:28: note: previous definition of ‘trace_snd_soc_dapm_done’ with type ‘void(struct snd_soc_card *, int)’
   256 | static inline void trace_##name(proto) \
       | ^~~~~~
 ./include/linux/tracepoint.h:434:9: note: in expansion of macro ‘__DECLARE_TRACE’
   434 | __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \
       | ^~~~~~~~~~~~~~~
 ./include/linux/tracepoint.h:557:9: note: in expansion of macro ‘DECLARE_TRACE’
   557 | DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
       | ^~~~~~~~~~~~~
 ./include/trace/events/asoc.h:87:1: note: in expansion of macro ‘DEFINE_EVENT’
    87 | DEFINE_EVENT(snd_soc_dapm_basic, snd_soc_dapm_done,
       | ^~~~~~~~~~~~
 /var/lib/dkms/lttng-modules/2.13.11/build/src/lttng-events.c:3030:5: warning: no previous prototype for ‘lttng_metadata_printf’ [-Wmissing-prototypes]
  3030 | int lttng_metadata_printf(struct lttng_kernel_session *session,
       | ^~~~~~~~~~~~~~~~~~~~~
 make[4]: *** [scripts/Makefile.build:244: /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/lttng-probe-asoc.o] Error 1
 make[3]: *** [scripts/Makefile.build:485: /var/lib/dkms/lttng-modules/2.13.11/build/src/probes] Error 2
 make[3]: *** Waiting for unfinished jobs....
 make[2]: *** [scripts/Makefile.build:485: /var/lib/dkms/lttng-modules/2.13.11/build/src] Error 2
 make[1]: *** [/usr/src/linux-headers-6.10.0-1005-oem/Makefile:1939: /var/lib/dkms/lttng-modules/2.13.11/build] Error 2
 make: *** [Makefile:240: __sub-make] Error 2
 make: Leaving directory '/usr/src/linux-headers-6.10.0-1005-oem'

[GuoqingJiang (guoqingjiang)]

This is probably because 6.10 kernel has the commit

commit e9669a00bba79442dd4862c57761333d6a020c24
Author: Balazs Scheidler <email address hidden>
Date: Tue Mar 26 19:05:47 2024 +0100

    net: udp: add IP/port data to the tracepoint udp/udp_fail_queue_rcv_skb

    The udp_fail_queue_rcv_skb() tracepoint lacks any details on the source
    and destination IP/port whereas this information can be critical in case
    of UDP/syslog.

    Signed-off-by: Balazs Scheidler <email address hidden>
    Reviewed-by: Jason Xing <email address hidden>
    Link: https://lore.kernel.org/r/0c8b3e33dbf679e190be6f4c6736603a76988a20<email address hidden>
    Signed-off-by: Jakub Kicinski <email address hidden>

diff --git a/include/trace/events/udp.h b/include/trace/events/udp.h

And will pick the commit from upstream lttng git to our noble lttng.

commit 8c34b41250497ef69693f3e14045ede4aa076207
Author: Michael Jeanson <email address hidden>
Date: Mon May 27 11:11:21 2024 -0400

    fix: net: udp: add IP/port data to the tracepoint udp/udp_fail_queue_rcv_skb (v6.10)

    See upstream commit:

      commit e9669a00bba79442dd4862c57761333d6a020c24
      Author: Balazs Scheidler <email address hidden>
      Date: Tue Mar 26 19:05:47 2024 +0100

        net: udp: add IP/port data to the tracepoint udp/udp_fail_queue_rcv_skb

        The udp_fail_queue_rcv_skb() tracepoint lacks any details on the source
        and destination IP/port whereas this information can be critical in case
        of UDP/syslog.

    Change-Id: I0c337c5817b0a120298cbf5088d60671d9625b0d
    Signed-off-by: Michael Jeanson <email address hidden>
    Signed-off-by: Mathieu Desnoyers <email address hidden>

And we need another commit from upstream lttng repo for snd_soc_dapm errors.

[GuoqingJiang (guoqingjiang)]

Besides udp and sound errors, there is another error during test

/var/lib/dkms/lttng-modules/2.13.11/build/src/probes/../../include/wrapper/fdtable.h: In function ‘lttng_close_on_exec’:
/var/lib/dkms/lttng-modules/2.13.11/build/src/probes/../../include/wrapper/fdtable.h:76:34: error: passing argument 2 of ‘close_on_exec’ from incompatible pointer type [-Werror=incompatible-pointer-types]
   76 | return close_on_exec(fd, fdt);
      | ^~~
      | |
      | const struct fdtable *
In file included from /var/lib/dkms/lttng-modules/2.13.11/build/src/probes/../../include/wrapper/fdtable.h:12:
./include/linux/fdtable.h:100:78: note: expected ‘const struct files_struct *’ but argument is of type ‘const struct fdtable *’
  100 | static inline bool close_on_exec(unsigned int fd, const struct files_struct *files)
      | ~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
cc1: some warnings being treated as errors

[GuoqingJiang (guoqingjiang)]

Another error due to the mismatch between lttng tool and 6.10 kernel.

var/lib/dkms/lttng-modules/2.13.11/build/src/lttng-statedump-impl.c: In function ‘lttng_enumerate_network_ip_interface’:
/var/lib/dkms/lttng-modules/2.13.11/build/src/lttng-statedump-impl.c:399:20: error: ‘dev_base_lock’ undeclared (first use in this function); did you mean ‘device_lock’?
  399 | read_lock(&dev_base_lock);
      | ^~~~~~~~~~~~~
./include/linux/rwlock.h:56:48: note: in definition of macro ‘read_lock’

And the relevant patch is included in the debdiff as well