From 0137ad2e13d176bf3e78b0641ded1a13f4665358 Mon Sep 17 00:00:00 2001 From: Bjarki Arge Andreasen Date: Tue, 13 Aug 2024 16:21:21 +0200 Subject: [PATCH] upmerge upmerge Signed-off-by: Bjarki Arge Andreasen --- west.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/west.yml b/west.yml index cda71a89e2fe..e006c47fda87 100644 --- 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: 8bd088c7c2936dbc94eddd5ede980d45a341e73d + 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