Skip to content

manifest: Upmerge sdk-zephyr repository#27726

Merged
carlescufi merged 80 commits into
nrfconnect:mainfrom
anangl:upmerge_20260325
Apr 30, 2026
Merged

manifest: Upmerge sdk-zephyr repository#27726
carlescufi merged 80 commits into
nrfconnect:mainfrom
anangl:upmerge_20260325

Conversation

@anangl
Copy link
Copy Markdown
Contributor

@anangl anangl commented Mar 26, 2026 •
edited by kszromek-nordic
Loading

Regular upmerge.

test_iot_libmodem: PR-5951
test-sdk-nrf: sdk-nrf-pr-27726
test_sdk_mcuboot: fix-for-upmarge
test_crypto: PR-989
test_wifi: wifi_upmerge_pr_27726
test_rs: PR-1940
test_fem: PR-1940
test_tfm: PR-224
test_ble_mesh: PR-250
test_sdk_dfu: PR-777

@anangl anangl requested review from a team as code owners March 26, 2026 12:35
@NordicBuilder
Copy link
Copy Markdown
Contributor

NordicBuilder commented Mar 26, 2026 •
edited
Loading

The following west manifest projects have changed revision in this Pull Request:

Name Old Revision New Revision Diff
hostap 🆕 N/A (Added) nrfconnect/sdk-hostap@8fd18de (upmerge_20260325) N/A
matter nrfconnect/sdk-connectedhomeip@68fb1e3 nrfconnect/sdk-connectedhomeip@d7be4e6 (master) nrfconnect/sdk-connectedhomeip@68fb1e39..d7be4e64
mcuboot nrfconnect/sdk-mcuboot@3564357 nrfconnect/sdk-mcuboot@8230615 (main) nrfconnect/sdk-mcuboot@3564357d..82306158
memfault-firmware-sdk memfault/memfault-firmware-sdk@1.37.1 memfault/memfault-firmware-sdk@1.38.0 memfault/memfault-firmware-sdk@1.37.1..1.38.0
nrfxlib nrfconnect/sdk-nrfxlib@acb0f7e nrfconnect/sdk-nrfxlib@45b524b (main) nrfconnect/sdk-nrfxlib@acb0f7e6..45b524bc
zephyr nrfconnect/sdk-zephyr@22041af nrfconnect/sdk-zephyr@e88cd52 (main) nrfconnect/sdk-zephyr@22041af2..e88cd523

⛔ DNM label due to: 1 added project

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@anangl anangl requested review from a team as code owners March 26, 2026 13:55
@NordicBuilder NordicBuilder requested review from a team, krish2718 and sachinthegreen March 27, 2026 10:47
@anangl anangl force-pushed the upmerge_20260325 branch from aa8cafd to 34baaf4 Compare March 30, 2026 08:46
@anangl anangl requested a review from a team as a code owner March 30, 2026 08:46
@anangl anangl force-pushed the upmerge_20260325 branch 2 times, most recently from d5ac86b to 7a1f9cd Compare March 30, 2026 13:31
@NordicBuilder NordicBuilder requested review from a team March 30, 2026 13:32
@anangl anangl mentioned this pull request Mar 30, 2026
Closed
@anangl anangl force-pushed the upmerge_20260325 branch from 7a1f9cd to 6023154 Compare March 31, 2026 08:25
@anangl anangl requested review from a team as code owners March 31, 2026 08:25
@anangl anangl force-pushed the upmerge_20260325 branch from 676e6c9 to 1cdcd85 Compare March 31, 2026 11:18
tomi-font and others added 24 commits April 30, 2026 12:09
@tomi-font @anangl
scripts: quarantine_zephyr: add crypto.secp256r1.*
c9f461e 
As of now this is not supported in NCS.
Add all platforms that have been seen failing.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
@tomi-font @anangl
tests: tfm: tfm_psa_test: disable problematic Kconfig options
3f9066f 
Commit `06dd00c340948455c30608c273e2a9bbd15f5543` in Zephyr put part
of the TF-M CMake integration behind `NOT CONFIG_TFM_USE_NS_APP`.

It makes sense because when `CONFIG_TFM_USE_NS_APP` is enabled we
shouldn't build the NS app because TF-M is providing it.

However in that scenario we still wrongfully build and then discard
the Zephyr NS app, and now this results in undefined references to
functions.

Fix those by turning off the features which result in code needing
TF-M functions that are not made available anymore.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
@nordic-krch @anangl
tests: zephyr: drivers: uart: uart_mix_fifo_poll: Use timer based RNG
f0a93ad 
Test is using random API from interrupt context and some entropy
drivers don't support it. It's a test so pseudo-rng is ok.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
@nordic-piks @anangl
scripts: quarantine: add sample.bluetooth.mesh_dfu
1b1297f 
Until PM removal

Signed-off-by: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
@tomchy @anangl
img_mgmt: Align with the mapped partitions
e7af71c 
Align NCS extensions for the image management group with changes made
after introducing the mapped partitions binding.

Ref: NCSDK-NONE

Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
@tomchy @anangl
img_mgmt: Align merged slot mapped partitions
1cbbce7 
Align NCS extensions for the image management group with changes made
after introducing the mapped partitions binding.
This commit fixes the active partition detection for builds that uses
merged slot approach.

Ref: NCSDK-NONE

Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
@tomchy @anangl
samples: dfu: Enable UART_MCUMGR
0212837 
Enable UART_MCUMGR whenever MCUMGR_TRANSPORT_UART is used.

Ref: NCSDK-NONE

Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
@alexsven @anangl
applications: nrf5340_audio: Upmerge fixes
7a0dbf5 
- Invert logic for foreach function in unicast_client
- Increase stack size
- Add CONFIG_POLL for k_poll_signal
- OCT-3598

Signed-off-by: Alexander Svensen <alexander.svensen@nordicsemi.no>
@erdemsimsek @anangl
applications: hpf: update nRF7120 GPIO asm for zephyr-sdk 1.0
bb3fa19 
Update nRF7120 HPF GPIO ASM for zephyr-sdk 1.0 CI.

Signed-off-by: Erdem Simsek <erdem.simsek@nordicsemi.no>
@jaz1-nordic @anangl
applications: hpf: update nRF54LV10A asm for zephyr-sdk 1.0.1
ce55e3c 
Update nRF54LV10A HPF MSPI ASM for zephyr-sdk 1.0.1.

Signed-off-by: Jakub Zymelka <jakub.zymelka@nordicsemi.no>
@nordic-piks @anangl
scripts: quarantine_zephyr: add libraries.heap.hardening_full
098e97c 
RAM overflow.

Signed-off-by: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
@nordic-piks @anangl
scripts: quarantine_zephyr: extend for bluetooth.shell.shell_br
8a9636f 
Overflows.

Signed-off-by: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
@anangl
doc: memfault_ncs: Remove reference to CONFIG_MEMFAULT_NRF_SHELL
1494fd3 
This Kconfig option has been removed in Memfault Firmware SDK 1.38.0.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
@tomi-font @anangl
nrf_security: define CONFIG_PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_DERIVE
f7c1a87 
Allows reverting
nrfconnect/sdk-zephyr@2d60426.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
@tomchy @anangl
img_mgmt: Use custom logic for merged slot
9a1fb54 
Use custom logic when merged slot approach is in use.

Ref: NCSDK-NONE

Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no>
@adsz-nordic @anangl
samples: dfu: single_slot: Fix mcuboot on ls05b
eb3da2c 
Disable deprecated ENTROPY_PSA_CRYPTO_RNG config.
It also decreases binary size so it fits into flash.

Signed-off-by: Adam Szczygieł <adam.szczygiel@nordicsemi.no>
@Damian-Nordic @anangl
samples: bluetooth: add missing zephyr,mapped-partition
2c3fa3d 
Update bluetooth peripheral_lbs and peripheral_power_profiling to use
the zephyr,mapped-partition compatible.

Signed-off-by: Damian Krolik <damian.krolik@nordicsemi.no>
@gmarull @claude @anangl
doc: zephyr: add missing driver_ops Doxygen aliases
0243386 
Mirror the driver_ops/def_driverbackendgroup ALIASES added in upstream
Zephyr's doxyfile so the Zephyr Doxygen build no longer emits unknown
command warnings on driver headers.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@nordic-piks @anangl
scripts: quarantine_zephyr: add wifi.build
8f3063f 
Regresssion until MBEDTLS upmerge.

Signed-off-by: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
@nordic-piks @anangl
scripts: quarantine: add applications.nrf_desktop.zrelease for ls05
5f40fb6 
Regression.

Signed-off-by: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
@gmarull @claude @anangl
doc: replace broken intersphinx refs to old Zephyr release notes
6bf19b8 
The zephyr_2.4 and zephyr_2.6 labels are no longer present in the
upstream Zephyr documentation (those release notes are no longer in the
toctree). Link directly to the archived Zephyr docs instead so the
Sphinx build does not fail with undefined label warnings.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@nordic-piks @anangl
scripts: quarantine: add sample.bluetooth.peripheral* at h20
6b524b2 
Regression.

Signed-off-by: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
@adsz-nordic @anangl
tests: ref_smp_svr: Fix test on nrf54ls05b
fca4f8c 
Fix build problem by disabling deprecated kconfig.

Signed-off-by: Adam Szczygieł <adam.szczygiel@nordicsemi.no>
@maje-emb @anangl
samples: esb: use central appcore sysbuild integration
d10ccef 
Drop the per-sample sysbuild.cmake files in esb_ptx and esb_prx that
duplicated nrf/sysbuild/appcore.cmake. Instead set NRF_DEFAULT_EMPTY
for SOC_SERIES_NRF53X in Kconfig.sysbuild.

Signed-off-by: Marcin Jelinski <marcin.jelinski@nordicsemi.no>
@trantanen trantanen mentioned this pull request May 4, 2026
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MarekPieta MarekPieta MarekPieta left review comments

@MarGasiorek MarGasiorek MarGasiorek approved these changes

@nordicjm nordicjm nordicjm left review comments

@hermabe hermabe hermabe left review comments

@FrancescoSer FrancescoSer FrancescoSer approved these changes

@nordic-mare nordic-mare nordic-mare approved these changes

@carlescufi carlescufi carlescufi approved these changes

@grochu grochu grochu approved these changes

@alxelax alxelax alxelax approved these changes

@PerMac PerMac PerMac approved these changes

@PavelVPV PavelVPV PavelVPV approved these changes

@nordic-segl nordic-segl nordic-segl approved these changes

@bjarki-andreasen bjarki-andreasen bjarki-andreasen approved these changes

@juhaylinen juhaylinen juhaylinen approved these changes

@divipillai divipillai divipillai approved these changes

@ArekBalysNordic ArekBalysNordic ArekBalysNordic approved these changes

@nordic-piks nordic-piks nordic-piks approved these changes

@tokangas tokangas tokangas approved these changes

@ivaniushkov ivaniushkov ivaniushkov approved these changes

@tomi-font tomi-font tomi-font approved these changes

@pascal-nordic pascal-nordic pascal-nordic approved these changes

@krish2718 krish2718 Awaiting requested review from krish2718 krish2718 is a code owner

@sachinthegreen sachinthegreen Awaiting requested review from sachinthegreen sachinthegreen is a code owner

@rob-robinson-14 rob-robinson-14 Awaiting requested review from rob-robinson-14 rob-robinson-14 is a code owner

@Hi-Im-David Hi-Im-David Awaiting requested review from Hi-Im-David Hi-Im-David is a code owner

@travis3630 travis3630 Awaiting requested review from travis3630 travis3630 is a code owner

@tejlmand tejlmand Awaiting requested review from tejlmand tejlmand is a code owner

@adamkondraciuk adamkondraciuk Awaiting requested review from adamkondraciuk adamkondraciuk is a code owner

@rghaddab rghaddab Awaiting requested review from rghaddab rghaddab is a code owner

@kl-cruz kl-cruz Awaiting requested review from kl-cruz

@nordic-krch nordic-krch Awaiting requested review from nordic-krch

@ppryga-nordic ppryga-nordic Awaiting requested review from ppryga-nordic

@katgiadla katgiadla Awaiting requested review from katgiadla katgiadla is a code owner

@Damian-Nordic Damian-Nordic Awaiting requested review from Damian-Nordic Damian-Nordic is a code owner

@MarekPorwisz MarekPorwisz Awaiting requested review from MarekPorwisz MarekPorwisz is a code owner

@jukkar jukkar Awaiting requested review from jukkar

@rado17 rado17 Awaiting requested review from rado17 rado17 is a code owner

@magnev magnev Awaiting requested review from magnev magnev is a code owner

Assignees

No one assigned

Labels

CI-all-test Run All integration tests CI-force-downstream doc-required PR must not be merged without tech writer approval. manifest manifest-hostap manifest-matter manifest-mcuboot manifest-memfault-firmware-sdk manifest-nrfxlib manifest-zephyr no-changelog upmerge

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.