From b9c23664d3c7e37c54298195f9d36a651b7870ee Mon Sep 17 00:00:00 2001
From: Marc Herbert <marc.herbert@intel.com>
Date: Fri, 20 Oct 2023 15:50:21 -0700
Subject: [PATCH 1/4] .github/zephyr: de-hardcode the name of the zephyr remote

Fixes issue reported in stable-v2.7 #8353 which wants to use our own,
downstream Zephyr branch.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
(cherry picked from commit 4bc6488b24e445ca7e6713b8c97f870b73788db5)
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
---
 .github/workflows/zephyr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml
index 58ba753db144..7827c603ad01 100644
--- a/.github/workflows/zephyr.yml
+++ b/.github/workflows/zephyr.yml
@@ -167,7 +167,7 @@ jobs:
           #     both issues in no time.
 
           cd zephyr
-          git fetch --filter=tree:0 zephyrproject "$rem_rev":_branch_placeholder
+          git fetch --filter=tree:0 "$(git remote |head -n1)" "$rem_rev":_branch_placeholder
           git branch -D _branch_placeholder
 
           set -x

From 866d0b35b78430f9d9c0d969965150358e241312 Mon Sep 17 00:00:00 2001
From: Marc Herbert <marc.herbert@intel.com>
Date: Fri, 20 Oct 2023 15:53:35 -0700
Subject: [PATCH 2/4] .github/zephyr: time some fetch commands

GitHub conveniently times each step but to reduce step proliferation we
sometimes have multiple commands in a single step and lose the ability
to time download commands. Prefix them with `time` to restore the data.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
(cherry picked from commit 92fa7952d057dc41ac3c4ec952503a335468bae5)
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
---
 .github/workflows/zephyr.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml
index 7827c603ad01..dd9f10704b3e 100644
--- a/.github/workflows/zephyr.yml
+++ b/.github/workflows/zephyr.yml
@@ -133,7 +133,7 @@ jobs:
       - name: west clones
 
         run: pip3 install west && cd workspace/sof/ && west init -l &&
-               west update --narrow --fetch-opt=--filter=tree:0
+               time west update --narrow --fetch-opt=--filter=tree:0
 
       - name: select zephyr revision
         run: |
@@ -149,7 +149,7 @@ jobs:
                sed -e "s#=sof_zephyr_revision_override=#${rem_rev}#" \
                  sof-ci-jenkins/zephyr-override-template.yml > test-zephyr-main.yml
              )
-             west update --narrow  --fetch-opt=--filter=tree:0
+             time west update --narrow  --fetch-opt=--filter=tree:0
           fi
 
           # Because we used git tricks to speed things up, we now have two git
@@ -167,7 +167,7 @@ jobs:
           #     both issues in no time.
 
           cd zephyr
-          git fetch --filter=tree:0 "$(git remote |head -n1)" "$rem_rev":_branch_placeholder
+          time git fetch --filter=tree:0 "$(git remote |head -n1)" "$rem_rev":_branch_placeholder
           git branch -D _branch_placeholder
 
           set -x

From 3b6eda271b8106bb4f1da85b6889e5c93d300719 Mon Sep 17 00:00:00 2001
From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Date: Thu, 19 Oct 2023 17:56:49 +0300
Subject: [PATCH 3/4] west.yml: update Zephyr to sofproject stable-v2.7

Update Zephyr to use thesofproject/zephyr/stable-v2.7 with
following commits backported from Zephyr main.

3c58926487eb drivers: dma: intel-adsp-hda: Correct DGCS:SCS bit for
feaa6281b7fc drivers: hda: insert an empty ";" statement before

Link: https://github.com/thesofproject/sof/issues/8236
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
---
 west.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/west.yml b/west.yml
index 6ba4e0505898..b155b9c8eb3f 100644
--- a/west.yml
+++ b/west.yml
@@ -45,8 +45,8 @@ manifest:
 
     - name: zephyr
       repo-path: zephyr
-      revision: 5689916a70ad5c363bd7d5511b772ada90067d51
-      remote: zephyrproject
+      revision: feaa6281b7fc8af6ed6099b2bc1955e3f9925493
+      remote: thesofproject
 
       # Import some projects listed in zephyr/west.yml@revision
       #

From bb0e972ddb2c166ec51f964af7fc922a3cbb1603 Mon Sep 17 00:00:00 2001
From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Date: Thu, 19 Oct 2023 17:59:52 +0300
Subject: [PATCH 4/4] versions.json: bump version to 2.7.1

Set version to 2.7.1 as we start merging bugfixes.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
---
 versions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions.json b/versions.json
index 0eb1020a09ea..748078ee8d87 100644
--- a/versions.json
+++ b/versions.json
@@ -2,6 +2,6 @@
   "SOF": {
     "MAJOR": "2",
     "MINOR": "7",
-    "MICRO": "0"
+    "MICRO": "1"
   }
 }