Skip to content

Conversation

@krish2718
Copy link
Contributor

Upmerge for 3.1.0 release.

@krish2718 krish2718 requested review from a team as code owners July 20, 2025 09:03
@github-actions github-actions bot added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Jul 20, 2025
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Jul 20, 2025

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

Name Old Revision New Revision Diff
zephyr nrfconnect/sdk-zephyr@8cba1f6 nrfconnect/sdk-zephyr@cebbc7c (main) nrfconnect/[email protected]

All manifest checks OK

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

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Jul 20, 2025

CI Information

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

Inputs:

Sources:

sdk-nrf: PR head: 49789e5fd7b0c210503653572ed8f6d4343b6d74
hostap: PR head: e942f86e865d5b24bbbe8b0c333f030cbbe62bfb
zephyr: PR head: cebbc7c0b844060ba2f344432ecba0482caf3b39

more details

sdk-nrf:

PR head: 49789e5fd7b0c210503653572ed8f6d4343b6d74
merge base: cf431dcd5ac6a2a861ab460ada421dc2cb7ce624
target head (main): 27bd6be1ccdbf4b434f450ef8eaf6e2e3a0bfe4d
Diff

hostap:

PR head: e942f86e865d5b24bbbe8b0c333f030cbbe62bfb
merge base: 8412f4b23b6267ee6035d25515a23aaf243f6ad7
Diff

zephyr:

PR head: cebbc7c0b844060ba2f344432ecba0482caf3b39
merge base: 8cba1f6198f880ce025d6f69625e42cdfdb0d4d0
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 (60)
modules
│  ├── lib
│  │  ├── hostap
│  │  │  ├── hostapd
│  │  │  │  ├── ctrl_iface_zephyr.c
│  │  │  │  ├── ctrl_iface_zephyr.h
│  │  │  │  │ hostapd_cli_zephyr.c
│  │  │  ├── src
│  │  │  │  ├── ap
│  │  │  │  │  │ hostapd.h
│  │  │  │  ├── common
│  │  │  │  │  ├── wpa_ctrl.c
│  │  │  │  │  │ wpa_ctrl.h
│  │  │  │  ├── crypto
│  │  │  │  │  │ crypto_mbedtls_alt.c
│  │  │  ├── wpa_supplicant
│  │  │  │  ├── ctrl_iface_zephyr.c
│  │  │  │  ├── ctrl_iface_zephyr.h
│  │  │  │  │ wpa_cli_zephyr.c
│  ├── trusted-firmware-m
│  │  │ Kconfig.tfm.pm
samples
│  ├── wifi
│  │  ├── shell
│  │  │  │ Kconfig
subsys
│  ├── nrf_security
│  │  │ Kconfig.legacy
west.yml
zephyr
│  ├── Kconfig.zephyr
│  ├── drivers
│  │  ├── wifi
│  │  │  ├── nrf_wifi
│  │  │  │  ├── Kconfig.nrfwifi
│  │  │  │  ├── inc
│  │  │  │  │  │ fmac_main.h
│  │  │  │  ├── src
│  │  │  │  │  ├── fmac_main.c
│  │  │  │  │  ├── net_if.c
│  │  │  │  │  ├── wifi_mgmt.c
│  │  │  │  │  │ wifi_util.c
│  ├── include
│  │  ├── zephyr
│  │  │  ├── drivers
│  │  │  │  ├── wifi
│  │  │  │  │  ├── nrf_wifi
│  │  │  │  │  │  ├── bus
│  │  │  │  │  │  │  │ rpu_hw_if.h
│  ├── kernel
│  │  │ Kconfig
│  ├── lib
│  │  ├── os
│  │  │  ├── zvfs
│  │  │  │  │ Kconfig
│  ├── modules
│  │  ├── hostap
│  │  │  ├── Kconfig
│  │  │  ├── src
│  │  │  │  ├── hapd_events.c
│  │  │  │  ├── supp_api.c
│  │  │  │  ├── supp_events.c
│  │  │  │  │ supp_main.c
│  │  ├── nrf_wifi
│  │  │  ├── bus
│  │  │  │  ├── qspi_if.c
│  │  │  │  ├── rpu_hw_if.c
│  │  │  │  │ spi_if.c
│  │  │  ├── os
│  │  │  │  │ shim.c
│  ├── samples
│  │  ├── net
│  │  │  ├── wifi
│  │  │  │  ├── test_certs
│  │  │  │  │  ├── rsa2k_no_des
│  │  │  │  │  │  ├── ca.pem
│  │  │  │  │  │  ├── ca2.pem
│  │  │  │  │  │  ├── client-key.pem
│  │  │  │  │  │  ├── client-key2.pem
│  │  │  │  │  │  ├── client.pem
│  │  │  │  │  │  ├── client2.pem
│  │  │  │  │  │  ├── server-key.pem
│  │  │  │  │  │  │ server.pem
│  │  │  │  │  ├── rsa3k
│  │  │  │  │  │  ├── ca.pem
│  │  │  │  │  │  ├── ca2.pem
│  │  │  │  │  │  ├── client-key.pem
│  │  │  │  │  │  ├── client-key2.pem
│  │  │  │  │  │  ├── client.pem
│  │  │  │  │  │  ├── client2.pem
│  │  │  │  │  │  ├── server-key.pem
│  │  │  │  │  │  │ server.pem
│  ├── scripts
│  │  ├── kconfig
│  │  │  │ kconfig.py
│  ├── share
│  │  ├── sysbuild
│  │  │  │ Kconfig
│  ├── snippets
│  │  ├── wifi-credentials
│  │  │  ├── README.rst
│  │  │  ├── snippet.yml
│  │  │  │ wifi-credentials.conf
│  │  ├── wifi-enterprise
│  │  │  ├── snippet.yml
│  │  │  ├── wifi-enterprise-nrf-ns.conf
│  │  │  ├── wifi-enterprise-nrf.conf
│  │  │  │ wifi-enterprise.conf
│  ├── subsys
│  │  ├── net
│  │  │  ├── lib
│  │  │  │  ├── sockets
│  │  │  │  │  │ Kconfig
│  │ west.yml

Outputs:

Toolchain

Version: 684b32e022
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:684b32e022_bba2ea5f2e

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

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister - Skipped: Skipping Build & Test as it succeeded in a previous run: 4
  • ✅ Integration tests
    • ✅ test_ble_nrf_config - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-chip - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nfc - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf-iot_cloud - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf-iot_zephyr_lwm2m - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf-iot_samples
    • ✅ test-fw-nrfconnect-nrf-iot_thingy91 - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf_crypto - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-rs - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-fem - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-tfm - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-thread-main - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-sdk-find-my - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf_lrcs_mosh - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf_lrcs_positioning - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-sdk-wifi - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-low-level - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-sdk-mcuboot - Skipped: Job was skipped as it succeeded in a previous run
    • ⚠️ test-fw-nrfconnect-nrf_lrcs_mosh
    • ⚠️ test-fw-nrfconnect-nrf_lrcs_positioning
Disabled integration tests
    • desktop52_verification
    • doc-internal
    • test-fw-nrfconnect-apps
    • test-fw-nrfconnect-ble_mesh
    • test-fw-nrfconnect-ble_samples
    • test-fw-nrfconnect-nrf-iot_libmodem-nrf
    • test-fw-nrfconnect-nrf-iot_lwm2m
    • test-fw-nrfconnect-nrf-iot_serial_lte_modem
    • test-fw-nrfconnect-ps-main
    • test-fw-nrfconnect-rpc
    • test-sdk-audio
    • test-sdk-pmic-samples
    • test-secdom-samples-public

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

@github-actions
Copy link

You can find the documentation preview for this PR here.

@krish2718 krish2718 force-pushed the wifi_upmerge_310 branch 2 times, most recently from 8323428 to 1314057 Compare July 20, 2025 18:53
NordicBuilder and others added 4 commits July 21, 2025 16:11
Automatically created by Github Action.

Signed-off-by: Nordic Builder <[email protected]>
Max MPI size is set to 256 by default. This needs to be increased
to 384 to handle RSA-3072 signature.

Signed-off-by: Ravi Dondaputi <[email protected]>
Increase size of Protected Storage partition to accommodate
the certificates required for W-Fi enterprise security.

Signed-off-by: Ravi Dondaputi <[email protected]>
For build with TFM and support for protected storage enabled,
additional RAM needs to be freed to accommodate the additional
features.

Signed-off-by: Ravi Dondaputi <[email protected]>
@NordicBuilder NordicBuilder removed the DNM label Jul 21, 2025
@rlubos
Copy link
Contributor

rlubos commented Jul 21, 2025

@nrfconnect/ncs-co-build-system PTAL

@nordicjm nordicjm merged commit 06c894a into nrfconnect:main Jul 21, 2025
13 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. manifest manifest-zephyr

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants