upmerge

upmerge Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
nrfconnect · Aug 13, 2024 · ec81b65 · ec81b65
1 parent f8070a8
commit ec81b65
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/west.yml b/west.yml
@@ -72,7 +72,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: 42f34339b66261d8bc725f7e82b8c9a4d5d3ba79
+      revision: pull/1953/head
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above
@@ -140,7 +140,7 @@ manifest:
           compare-by-default: true
     - name: mcuboot
       repo-path: sdk-mcuboot
-      revision: v2.1.0-ncs1
+      revision: pull/327/head
       path: bootloader/mcuboot
     - name: qcbor
       url: https://github.com/laurencelundblade/QCBOR