linux-yocto-dev: bump to v6.10
PATCH 1/2 linux-yocto-dev: bump to v6.10
From: Bruce Ashfield <[email protected]>
Signed-off-by Bruce Ashfield <[email protected]>
--- meta/recipes-kernel/linux/linux-yocto-dev.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-kernel/linux/linux-yocto-dev.bb +2 -2
@@ -14,7 +14,7 @@ require recipes-kernel/linux/linux-yocto.inc # provide this .inc to set specific revisions include recipes-kernel/linux/linux-yocto-dev-revisions.inc -KBRANCH = "v6.9/standard/base" +KBRANCH = "v6.10/standard/base" KMETA = "kernel-meta" SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name=machine;protocol=https \
@@ -28,7 +28,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name SRCREV_machine ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' SRCREV_meta ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' -LINUX_VERSION ?= "6.9" +LINUX_VERSION ?= "6.10" LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}" PV = "${LINUX_VERSION}+git"
Signature · 1 line
2.39.2
PATCH 2/2 lttng-modules: update to 2.13.13 and fix for 6.10+
From: Bruce Ashfield <[email protected]>
Bumping lttng-modules to 2.13.13, which allows us to drop some upstream patches.
We also import 4 patches that are required to build against 6.10.
Signed-off-by Bruce Ashfield <[email protected]>
---
...x-ASoC-snd_doc_dapm-on-linux-6.9-rc1.patch | 93 ------------
...mplify-delayed-ref-tracepoints-v6.10.patch | 142 ++++++++++++++++++
...c-pass-files_struct-instead-of-fdtab.patch | 79 ++++++++++
...ponent-to-set_bias_level-events-in-l.patch | 132 ----------------
...arent-and-ref_root-into-btrfs_delaye.patch | 58 +++++++
...n_migratepages-changed-in-linux-6.9-.patch | 81 ----------
...IP-port-data-to-the-tracepoint-udp-u.patch | 79 ++++++++++
...v_base_lock-removed-in-linux-6.9-rc1.patch | 57 -------
...es_2.13.12.bb => lttng-modules_2.13.13.bb} | 10 +-
9 files changed, 363 insertions(+), 368 deletions(-)
delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-Fix-ASoC-snd_doc_dapm-on-linux-6.9-rc1.patch
create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-simplify-delayed-ref-tracepoints-v6.10.patch
create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-close_on_exec-pass-files_struct-instead-of-fdtab.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0002-Fix-ASoC-add-component-to-set_bias_level-events-in-l.patch
create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0002-fix-btrfs-move-parent-and-ref_root-into-btrfs_delaye.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0003-Fix-mm_compaction_migratepages-changed-in-linux-6.9-.patch
create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0003-fix-net-udp-add-IP-port-data-to-the-tracepoint-udp-u.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0004-Fix-dev_base_lock-removed-in-linux-6.9-rc1.patch
rename meta/recipes-kernel/lttng/{lttng-modules_2.13.12.bb => lttng-modules_2.13.13.bb} (77%)meta/recipes-kernel/lttng/lttng-modules/0001-Fix-ASoC-snd_doc_dapm-on-linux-6.9-rc1.patch deleted +0 -93
@@ -1,93 +0,0 @@ -From fec007d9630e010062cf5699a08460f71f46b527 Mon Sep 17 00:00:00 2001 -From: Kienan Stewart <[email protected]> -Date: Mon, 25 Mar 2024 08:54:42 -0400 -Subject: [PATCH 1/4] Fix: ASoC snd_doc_dapm on linux 6.9-rc1 - -See upstream commit: - - commit 7df3eb4cdb6bbfa482f51548b9fd47c2723c68ba - Author: Luca Ceresoli <[email protected]> - Date: Wed Mar 6 10:30:01 2024 +0100 - - ASoC: trace: add event to snd_soc_dapm trace events - - Add the event value to the snd_soc_dapm_start and snd_soc_dapm_done trace - events to make them more informative. - - Trace before: - - aplay-229 [000] 250.140309: snd_soc_dapm_start: card=vscn-2046 - aplay-229 [000] 250.167531: snd_soc_dapm_done: card=vscn-2046 - aplay-229 [000] 251.169588: snd_soc_dapm_start: card=vscn-2046 - aplay-229 [000] 251.195245: snd_soc_dapm_done: card=vscn-2046 - - Trace after: - - aplay-214 [000] 693.290612: snd_soc_dapm_start: card=vscn-2046 event=1 - aplay-214 [000] 693.315508: snd_soc_dapm_done: card=vscn-2046 event=1 - aplay-214 [000] 694.537349: snd_soc_dapm_start: card=vscn-2046 event=2 - aplay-214 [000] 694.563241: snd_soc_dapm_done: card=vscn-2046 event=2 - -Upstream-Status: Backport [88c4e0fe Fix: ASoC snd_doc_dapm on linux 6.9-rc1] - -Change-Id: If0d33544b8dd1dfb3d12ca9390892190fc0444b0 -Signed-off-by: Kienan Stewart <[email protected]> -Signed-off-by: Mathieu Desnoyers <[email protected]> ---- - include/instrumentation/events/asoc.h | 33 +++++++++++++++++++++++++++ - 1 file changed, 33 insertions(+) - -diff --git a/include/instrumentation/events/asoc.h b/include/instrumentation/events/asoc.h -index 21d13a0f..5126d4c1 100644 ---- a/include/instrumentation/events/asoc.h -+++ b/include/instrumentation/events/asoc.h -@@ -51,6 +51,38 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_card, snd_soc_bias_level_done, - - ) - -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0)) -+LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_basic, -+ -+ TP_PROTO(struct snd_soc_card *card, int event), -+ -+ TP_ARGS(card, event), -+ -+ TP_FIELDS( -+ ctf_string(name, card->name) -+ ctf_integer(int, event, event) -+ ) -+) -+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_basic, snd_soc_dapm_start, -+ -+ asoc_snd_soc_dapm_start, -+ -+ TP_PROTO(struct snd_soc_card *card, int event), -+ -+ TP_ARGS(card, event) -+ -+) -+ -+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_basic, snd_soc_dapm_done, -+ -+ asoc_snd_soc_dapm_done, -+ -+ TP_PROTO(struct snd_soc_card *card, int event), -+ -+ TP_ARGS(card, event) -+ -+) -+#else - LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_basic, - - TP_PROTO(struct snd_soc_card *card), -@@ -81,6 +113,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_basic, snd_soc_dapm_done, - TP_ARGS(card) - - ) -+#endif - - LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_widget, - --- -2.39.2 -
meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-simplify-delayed-ref-tracepoints-v6.10.patch new file +142 -0
142 lines not on this page · raw message
meta/recipes-kernel/lttng/lttng-modules/0001-fix-close_on_exec-pass-files_struct-instead-of-fdtab.patch new file +79 -0
79 lines not on this page · raw message
meta/recipes-kernel/lttng/lttng-modules/0002-Fix-ASoC-add-component-to-set_bias_level-events-in-l.patch deleted +0 -132
132 lines not on this page · raw message
meta/recipes-kernel/lttng/lttng-modules/0002-fix-btrfs-move-parent-and-ref_root-into-btrfs_delaye.patch new file +58 -0
58 lines not on this page · raw message
meta/recipes-kernel/lttng/lttng-modules/0003-Fix-mm_compaction_migratepages-changed-in-linux-6.9-.patch deleted +0 -81
81 lines not on this page · raw message
meta/recipes-kernel/lttng/lttng-modules/0003-fix-net-udp-add-IP-port-data-to-the-tracepoint-udp-u.patch new file +79 -0
79 lines not on this page · raw message
meta/recipes-kernel/lttng/lttng-modules/0004-Fix-dev_base_lock-removed-in-linux-6.9-rc1.patch deleted +0 -57
57 lines not on this page · raw message
meta/recipes-kernel/lttng/lttng-modules_2.13.13.bb renamed from meta/recipes-kernel/lttng/lttng-modules_2.13.12.bb +5 -5
@@ -10,16 +10,16 @@ inherit module include lttng-platforms.inc SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://0001-Fix-ASoC-snd_doc_dapm-on-linux-6.9-rc1.patch \ - file://0002-Fix-ASoC-add-component-to-set_bias_level-events-in-l.patch \ - file://0003-Fix-mm_compaction_migratepages-changed-in-linux-6.9-.patch \ - file://0004-Fix-dev_base_lock-removed-in-linux-6.9-rc1.patch \ + file://0001-fix-btrfs-simplify-delayed-ref-tracepoints-v6.10.patch \ + file://0002-fix-btrfs-move-parent-and-ref_root-into-btrfs_delaye.patch \ + file://0003-fix-net-udp-add-IP-port-data-to-the-tracepoint-udp-u.patch \ + file://0001-fix-close_on_exec-pass-files_struct-instead-of-fdtab.patch \ " # Use :append here so that the patch is applied also when using devupstream SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch" -SRC_URI[sha256sum] = "d85fcb66c7bd31003ab8735e8c77700e5e4f417b4c22fe1f20112cf435abad79" +SRC_URI[sha256sum] = "7d26c07a5e80b66aa7bdcfdaaf4857f00fc9a5cdde79226b2528676700d50228" export INSTALL_MOD_DIR="kernel/lttng-modules"
Signature · 1 line
2.39.2