From c702e9376d4424d8df32dff465a4e17ebdf009a9 Mon Sep 17 00:00:00 2001
From: "flowzone-app[bot]"
 <124931076+flowzone-app[bot]@users.noreply.github.com>
Date: Wed, 18 Sep 2024 12:32:03 +0000
Subject: [PATCH] v6.0.29

---
 .versionbot/CHANGELOG.yml                     | 23 +++++++++++++++++++
 CHANGELOG.md                                  |  5 ++++
 .../conf/distro/include/balena-os.inc         |  2 +-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
index 882289f573..1756984346 100644
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,26 @@
+- commits:
+    - subject: "modemmanager: Fix SIM7100E crash"
+      hash: e397c18742117596fed133e0b5992362e230f538
+      body: >
+        With the update to MM 1.22.0 we have received reports that
+
+        SIM7100E is not functioning correctly.
+
+        Followed up with ModemManager devs and it was discovered the issue
+
+        is related to a PCO setting:
+
+        https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/884
+      footer:
+        Change-type: patch
+        change-type: patch
+        Signed-off-by: Florin Sarbu <florin@balena.io>
+        signed-off-by: Florin Sarbu <florin@balena.io>
+      author: Florin Sarbu
+      nested: []
+  version: 6.0.29
+  title: ""
+  date: 2024-09-18T12:31:58.505Z
 - commits:
     - subject: "initrdscripts: replace cut by awk for parsing lsblk in cryptsetup hook"
       hash: c9544aaf502943f3b492d0a5907f1c1e401c6ac7
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3d34dad56..f0f164d255 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Change log
 -----------
 
+# v6.0.29
+## (2024-09-18)
+
+* modemmanager: Fix SIM7100E crash [Florin Sarbu]
+
 # v6.0.28
 ## (2024-09-18)
 
diff --git a/meta-balena-common/conf/distro/include/balena-os.inc b/meta-balena-common/conf/distro/include/balena-os.inc
index 805ad0e19c..3b29ec5ccd 100644
--- a/meta-balena-common/conf/distro/include/balena-os.inc
+++ b/meta-balena-common/conf/distro/include/balena-os.inc
@@ -5,7 +5,7 @@ include conf/distro/include/balena-os-rust-version.inc
 
 DISTRO = "balena-os"
 DISTRO_NAME = "balenaOS"
-DISTRO_VERSION = "6.0.28"
+DISTRO_VERSION = "6.0.29"
 HOSTOS_VERSION = "${DISTRO_VERSION}"
 python () {
     ''' Set HOSTOS_VERSION from board VERSION if available '''