From cb2d6ad49d0f930094935a0640595b942672c309 Mon Sep 17 00:00:00 2001
From: "flowzone-app[bot]"
 <124931076+flowzone-app[bot]@users.noreply.github.com>
Date: Fri, 9 Aug 2024 12:23:54 +0000
Subject: [PATCH] v5.4.0+rev3

---
 .versionbot/CHANGELOG.yml | 29 +++++++++++++++++++++++++++++
 CHANGELOG.md              |  6 ++++++
 VERSION                   |  2 +-
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
index 14a3a5d8..4307a275 100644
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,32 @@
+- commits:
+    - subject: Fix kernel dtc-lexer build error for rockpi-4b-rk3399
+      hash: 65e6a93478950ca0cbed00acba67d3c179ffcfe2
+      body: ""
+      footer:
+        Changelog-entry: Fix kernel dtc-lexer build error for rockpi-4b-rk3399
+        changelog-entry: Fix kernel dtc-lexer build error for rockpi-4b-rk3399
+        Signed-off-by: Florin Sarbu <florin@balena.io>
+        signed-off-by: Florin Sarbu <florin@balena.io>
+      author: Florin Sarbu
+      nested: []
+    - subject: Fix u-boot dtc-lexer build error for rockpi-4b-rk3399
+      hash: 1e659aa5651769d4263a6b2c48f6ddbdcdf057a8
+      body: >
+        This is a backport that fixes:
+
+
+        scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of
+        `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here
+      footer:
+        Changelog-entry: Fix u-boot dtc-lexer build error for rockpi-4b-rk3399
+        changelog-entry: Fix u-boot dtc-lexer build error for rockpi-4b-rk3399
+        Signed-off-by: Florin Sarbu <florin@balena.io>
+        signed-off-by: Florin Sarbu <florin@balena.io>
+      author: Florin Sarbu
+      nested: []
+  version: 5.4.0+rev3
+  title: ""
+  date: 2024-08-09T12:23:47.898Z
 - commits:
     - subject: Update contracts to 1d499fe7d33791e1ac6dccfe031e178b7d520bb4
       hash: d50b47ddc398b175f9f0c5c952b159dc34108f42
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87d0b72e..c5197449 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Change log
 -----------
 
+# v5.4.0+rev3
+## (2024-08-09)
+
+* Fix kernel dtc-lexer build error for rockpi-4b-rk3399 [Florin Sarbu]
+* Fix u-boot dtc-lexer build error for rockpi-4b-rk3399 [Florin Sarbu]
+
 # v5.4.0+rev2
 ## (2024-07-31)
 
diff --git a/VERSION b/VERSION
index d26336f4..e0e80865 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.4.0+rev2
\ No newline at end of file
+5.4.0+rev3
\ No newline at end of file