diff --git a/scripts/quarantine.yaml b/scripts/quarantine.yaml index aa71ca09a370..3b4c80b9c5d6 100644 --- a/scripts/quarantine.yaml +++ b/scripts/quarantine.yaml @@ -140,24 +140,6 @@ - nrf54h20dk@0.9.0/nrf54h20/cpuapp comment: "https://nordicsemi.atlassian.net/browse/NCSDK-35605" -- scenarios: - - applications.nrf_desktop.* - platforms: - - nrf52kbd/nrf52832 - comment: "Needs alignment to new errata system in nrfx - NRFX-8421" - -- scenarios: - - sample.bluetooth.mesh.light_ctrl - platforms: - - nrf52dk/nrf52832 - comment: "Needs alignment to new errata system in nrfx - NRFX-8421" - -- scenarios: - - sample.bluetooth.nrf_dm.timeslot - platforms: - - nrf52dk/nrf52832 - comment: "Needs alignment to new errata system in nrfx - NRFX-8421" - - scenarios: - sample.bluetooth.mesh.light_ctrl.emds platforms: diff --git a/west.yml b/west.yml index 9bd178ca3666..3ae4bed464cf 100644 --- a/west.yml +++ b/west.yml @@ -66,7 +66,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 0c9648fe64f0a4b82eaa5db7d0d1af5386cc91de + revision: pull/3288/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above