manifest: sdk-zephyr: [nrf fromlist] tests: spi_controller_peripheral: fix CTRLSEL conflict

[NordicBuilder]

Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-zephyr#2696

[NordicBuilder]

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

Name	Old Revision	New Revision	Diff
zephyr	nrfconnect/sdk-zephyr@f55a806	nrfconnect/sdk-zephyr@b41a7a4 (main)	nrfconnect/[email protected]

✅ All manifest checks OK

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

[NordicBuilder]

CI Information

^{To view the history of this post, clich the 'edited' button above}
Build number: 5

Inputs:

Sources:

hal_nordic: PR head: 8cdcc33c6e5c7618ca4e77ff19a0eab557cc4bd5
sdk-nrf: PR head: 7608704793850471455a94d7c327fd4e595fd46b
zephyr: PR head: b41a7a4bdef03aa2843162e25b3648e412ce8967

more details

hal_nordic:

PR head: 8cdcc33c6e5c7618ca4e77ff19a0eab557cc4bd5
merge base: 7440d573d36953b80cb6fb6438b147acb21bf753
Diff

sdk-nrf:

PR head: 7608704793850471455a94d7c327fd4e595fd46b
merge base: 1e2a4672d46f1c9355e60db3c724efda2dcbb97e
target head (main): 1e2a4672d46f1c9355e60db3c724efda2dcbb97e
Diff

zephyr:

PR head: b41a7a4bdef03aa2843162e25b3648e412ce8967
merge base: f55a8067736a905992ef47d164c87443879b273c
Diff

Github labels

Enabled	Name	Description
	ci-disabled	Disable the ci execution
	ci-all-test	Run all of ci, no test spec filtering will be done
	ci-force-downstream	Force execution of downstream even if twister fails
	ci-run-twister	Force run twister
	ci-run-zephyr-twister	Force run zephyr twister

List of changed files detected by CI (14)

modules
│  ├── hal
│  │  ├── nordic
│  │  │  ├── nrfx
│  │  │  │  ├── drivers
│  │  │  │  │  ├── include
│  │  │  │  │  │  │ nrfx_twim.h
│  │  │  │  │  ├── src
│  │  │  │  │  │  │ nrfx_twim.c
west.yml
zephyr
│  ├── include
│  │  ├── zephyr
│  │  │  ├── bluetooth
│  │  │  │  │ conn.h
│  ├── samples
│  │  ├── bluetooth
│  │  │  ├── channel_sounding
│  │  │  │  ├── src
│  │  │  │  │  ├── connected_cs_initiator.c
│  │  │  │  │  │ connected_cs_reflector.c
│  ├── subsys
│  │  ├── bluetooth
│  │  │  ├── host
│  │  │  │  ├── conn.c
│  │  │  │  ├── conn_internal.h
│  │  │  │  ├── cs.c
│  │  │  │  ├── shell
│  │  │  │  │  │ bt.c
│  ├── tests
│  │  ├── bluetooth
│  │  │  ├── host
│  │  │  │  ├── cs
│  │  │  │  │  ├── mocks
│  │  │  │  │  │  ├── conn.c
│  │  │  │  │  │  │ conn.h
│  │  ├── drivers
│  │  │  ├── spi
│  │  │  │  ├── spi_controller_peripheral
│  │  │  │  │  ├── boards
│  │  │  │  │  │  │ nrf54h20dk_nrf54h20_cpuapp_fast_spis.overlay
│  │ west.yml

Outputs:

Toolchain

Version: 7dbe0e2658
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:7dbe0e2658_8bf7ca4353

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

• ◻️ Toolchain - Skipped: existing toolchain is used
• ❌ Build twister
• ❌ Integration tests
  • ❌ test-sdk-audio
  • ❌ desktop52_verification
  • ❌ test_ble_nrf_config
  • ❌ test-fw-nrfconnect-ble_samples
  • ❌ test-fw-nrfconnect-chip
  • ❌ test-fw-nrfconnect-nfc
  • ❌ test-fw-nrfconnect-nrf-iot_thingy91
  • ❌ test-sdk-find-my
  • ❌ test-low-level
  • ❌ test-sdk-dfu

Disabled integration tests

• • doc-internal
  • test-fw-nrfconnect-apps
  • test-fw-nrfconnect-ble_mesh
  • test-fw-nrfconnect-boot
  • test-fw-nrfconnect-fem
  • test-fw-nrfconnect-nrf-iot_cloud
  • test-fw-nrfconnect-nrf-iot_libmodem-nrf
  • test-fw-nrfconnect-nrf-iot_lwm2m
  • test-fw-nrfconnect-nrf-iot_mosh
  • test-fw-nrfconnect-nrf-iot_positioning
  • test-fw-nrfconnect-nrf-iot_samples
  • test-fw-nrfconnect-nrf-iot_serial_lte_modem
  • test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
  • test-fw-nrfconnect-nrf_crypto
  • test-fw-nrfconnect-proprietary_esb
  • test-fw-nrfconnect-ps
  • test-fw-nrfconnect-rpc
  • test-fw-nrfconnect-rs
  • test-fw-nrfconnect-tfm
  • test-fw-nrfconnect-thread
  • test-sdk-mcuboot
  • test-sdk-pmic-samples
  • test-sdk-wifi
  • test-secdom-samples-public

Note: This message is automatically posted and updated by the CI

[hakonfam]

Added upmerge label to trigger full twister run

[github-actions]

You can find the documentation preview for this PR here.

[NordicBuilder]

This pull request has been marked as stale because it has been open (more than) 30 days with no activity. Remove the stale label or add a comment saying that you would like to have the label removed otherwise this pull request will automatically be closed in 7 days. Note, that you can always re-open a closed pull request at any time.