Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

manifest: Update upmerged respositories #12619

Merged
merged 91 commits into from
Jan 10, 2024
Merged

manifest: Update upmerged respositories #12619

merged 91 commits into from
Jan 10, 2024

Conversation

de-nordic
Copy link
Contributor

@de-nordic de-nordic commented Oct 10, 2023 •
edited
Loading

Upmerging:

  • sdk-mcuboot to 0c0470e294dcfb52aab92299356a5f3caa0aa52b
  • sdk-zephyr to 23cf389

test-sdk-nrf: test_upmerge_nov_23

@github-actions github-actions bot added changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. manifest labels Oct 10, 2023
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Oct 10, 2023 •
edited
Loading

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
find-my https://github.com/nrfconnect/sdk-find-my/commit/103345872da1b5b0e36d2ef7f8a1208c84612d8e https://github.com/nrfconnect/sdk-find-my/commit/de25273096aa6ab735121cb849ad10a9b46a67fd (main) nrfconnect/[email protected]
hostap nrfconnect/sdk-hostap@a6eb01d nrfconnect/sdk-hostap@5496459 (main) nrfconnect/[email protected]
matter nrfconnect/sdk-connectedhomeip@496275a nrfconnect/sdk-connectedhomeip@1a15f4c (master) nrfconnect/[email protected]
mcuboot nrfconnect/sdk-mcuboot@adab597 (next,upmerge-tmp) nrfconnect/sdk-mcuboot@beebb23 (main) nrfconnect/[email protected]
memfault-firmware-sdk memfault/[email protected] memfault/[email protected] memfault/[email protected]
nrfxlib nrfconnect/sdk-nrfxlib@d736ae1 nrfconnect/sdk-nrfxlib@ba22034 (main) nrfconnect/[email protected]
sidewalk nrfconnect/sdk-sidewalk@16dc7e6 nrfconnect/sdk-sidewalk@cc49dd2 nrfconnect/[email protected]
zephyr nrfconnect/sdk-zephyr@f59385b nrfconnect/sdk-zephyr@883c370 (main) nrfconnect/[email protected]

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

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Oct 10, 2023 •
edited
Loading

Test specification

CI/Jenkins/NRF

  • Integration Platforms

CI/Jenkins/integration

Test Module File based changes Manually selected West overwrite
desktop52_verification X
test-ci-nrfconnect-boot-fw-update X
test-fw-nrfconnect-apps X
test-fw-nrfconnect-ble_mesh X
test-fw-nrfconnect-ble_samples X
test-fw-nrfconnect-chip X
test-fw-nrfconnect-fem X
test-fw-nrfconnect-nrf-iot_cloud X
test-fw-nrfconnect-nrf-iot_libmodem-nrf X
test-fw-nrfconnect-nrf-iot_lwm2m X
test-fw-nrfconnect-nrf-iot_mosh X
test-fw-nrfconnect-nrf-iot_nrf_provisioning X X
test-fw-nrfconnect-nrf-iot_positioning X
test-fw-nrfconnect-nrf-iot_samples X
test-fw-nrfconnect-nrf-iot_serial_lte_modem X
test-fw-nrfconnect-nrf-iot_thingy91 X
test-fw-nrfconnect-nrf-iot_zephyr_lwm2m X
test-fw-nrfconnect-nrf_crypto X
test-fw-nrfconnect-proprietary_esb X
test-fw-nrfconnect-rpc X
test-fw-nrfconnect-rs X
test-fw-nrfconnect-tfm X
test-fw-nrfconnect-thread X
test-fw-nrfconnect-zigbee X
test-sdk-audio X
test-sdk-find-my X
test-sdk-sidewalk X
test-sdk-wifi X

test-ci-nrfconnect-boot-fw-update: added because there was no .github/test-spec.yml in 'mcuboot'
test-fw-nrfconnect-chip: added because there was no .github/test-spec.yml in 'matter'
test-sdk-find-my: added because there was no .github/test-spec.yml in 'find-my'
test-sdk-sidewalk: added because there was no .github/test-spec.yml in 'sidewalk'
test-sdk-wifi: added because there was no .github/test-spec.yml in 'hostap'
All integration tests: null

Detailed information of selected test modules

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

@de-nordic de-nordic force-pushed the upmerge-20231010 branch 2 times, most recently from f319a28 to c69f343 Compare October 20, 2023 18:58
@de-nordic de-nordic requested review from hakonfam, sigvartmh and a team as code owners October 20, 2023 18:58
@de-nordic de-nordic changed the base branch from upmerge-tmp to main October 31, 2023 11:00
nordicjm and others added 18 commits January 10, 2024 10:50
@nordicjm
tests: lib: nrf_modem_lib: lte_net_if: Add zephyr include
5d148c6 
Fixes an issue by adding a zephyr include with the internal
sockets path

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
bluetooth: mesh: vnd: le_pair_resp: Fix for upmerge
f5ce398 
Fixes some issues which are present as a result of the zephyr
upmerge

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
sysbuild: Disable child image Kconfigs when PM is disabled
351105c 
Prevents PM being enabled when it should be disabled in zephyr
tests by disabling child image Kconfigs that enable the PM
Kconfig option

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
sysbuild: Hide child/parent Kconfig options
aa62556 
Disables configuration options for child/parent images

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
sysbuild: Do not set signing script if PM is disabled
6caeeb8 
Leave the default zephyr signing script if partition manager is
not enabled when using sysbuild

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
twister: quarantine: Remove sysbuild from list
32dd5bf 
Removes the sysbuild test from the quarantine list as this has
been fixed

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
twister: quarantine: Update LVGL list
f0f1d54 
Adds additional LVGL applications to the quarantine list due to
lack of sdl2

Signed-off-by: Jamie McCrae <[email protected]>
@de-nordic @nordicjm
applications/nrf5340_audio: Use codec_cfg_get_frame_duration_us
fc4fc51 
The upstream Zephyr commit 9c47eb9
does some code refactoring and replaces
 bt_audio_codec_cfg_get_frame_duration_us
with
 codec_cfg_get_frame_duration_us

Signed-off-by: Dominik Ermel <[email protected]>
@nordicjm
scripts: ci: license_allow_list: Add bt tester to allow list
9f5e51b 
Adds a bluetooth tester file to the apache 2.0 license allowed list

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
modules: tfm: assert: Change space indent to tab
4e8a2cc 
Fixes a compliance issue by replacing space indents with tabs

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
doc: nrf: release-notes-changelog: Update with upmerge commit
90587dd 
Updates the release details with the current zephyr commit

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
applications: matter_bridge: Rename hci_rpmsg to hci_ipc
97c5801 
Renames the folder as the underlying application has been renamed

Signed-off-by: Jamie McCrae <[email protected]>
@nordicjm
doc: nrf: hci_rpmsg_overlay: Rename file
452e99c 
The underlying application name has changed

Signed-off-by: Jamie McCrae <[email protected]>
@gmarull @nordicjm
doc: requirements: update
b42067d 
Add new requirements brought by Zephyr.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
@gmarull @nordicjm
doc: nrf: protocols: matter: fix table format
25153b5 
Table cells were not aligned.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
@gmarull @nordicjm
doc: nrf: add native_sim to sample board rows
9fe7811 
So that it can be used in sample tables.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
@gmarull @nordicjm
doc: nrf: update references to Zephyr documentation
b303803 
Update some references with their new id. Note that most samples now
require the usage of the Zephyr Sphinx domain, enabled in this patch as
well.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
@gmarull @nordicjm
doc: zephyr docset is no longer dodgy
831395f 
All warnings are gone.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
@NordicBuilder NordicBuilder removed the DNM label Jan 10, 2024
@koffes koffes self-requested a review January 10, 2024 12:12
koffes
koffes approved these changes Jan 10, 2024
View reviewed changes
Copy link
Contributor

@koffes koffes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Audio is good.

Frodevan
Frodevan requested changes Jan 10, 2024
View reviewed changes
Copy link
Contributor

@Frodevan Frodevan left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost good for audio test, but there is a minor discrepancy in the kconfig for one setting in one particular build-condfiguration of the audio application.

@Frodevan Frodevan self-requested a review January 10, 2024 14:11
Frodevan
Frodevan approved these changes Jan 10, 2024
View reviewed changes
Copy link
Contributor

@Frodevan Frodevan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, CONFIG_NCS_INCLUDE_RPMSG_CHILD_IMAGE may still be called as such and not CONFIG_NCS_INCLUDE_IPC_CHILD_IMAGE, but we have decided that this is not a blocker for the Audio project as of now.

@nordicjm nordicjm merged commit 11a9037 into nrfconnect:main Jan 10, 2024
41 of 42 checks passed
@de-nordic de-nordic deleted the upmerge-20231010 branch March 4, 2024 19:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@balaji-srin balaji-srin balaji-srin left review comments

@MarekPieta MarekPieta MarekPieta approved these changes

@bjda bjda bjda approved these changes

@SeppoTakalo SeppoTakalo SeppoTakalo approved these changes

@alstrzebonski alstrzebonski alstrzebonski approved these changes

@greg-fer greg-fer greg-fer approved these changes

@tejlmand tejlmand tejlmand approved these changes

@gmarull gmarull gmarull approved these changes

@jciupis jciupis jciupis approved these changes

@jayteemo jayteemo jayteemo approved these changes

@sigvartmh sigvartmh sigvartmh approved these changes

@magnev magnev magnev approved these changes

@glarsennordic glarsennordic glarsennordic approved these changes

@oyvindronningstad oyvindronningstad oyvindronningstad approved these changes

@Frodevan Frodevan Frodevan approved these changes

@shanthanordic shanthanordic shanthanordic approved these changes

@trantanen trantanen trantanen approved these changes

@eivindj-nordic eivindj-nordic eivindj-nordic approved these changes

@jtguggedal jtguggedal jtguggedal approved these changes

@canisLupus1313 canisLupus1313 canisLupus1313 approved these changes

@koffes koffes koffes approved these changes

@plskeggs plskeggs plskeggs approved these changes

@alexsven alexsven alexsven approved these changes

@pdunaj pdunaj pdunaj approved these changes

@MarkusLassila MarkusLassila MarkusLassila approved these changes

@D-Triveni D-Triveni D-Triveni approved these changes

@tony-le-24 tony-le-24 tony-le-24 approved these changes

@juhaylinen juhaylinen juhaylinen approved these changes

@hakonfam hakonfam Awaiting requested review from hakonfam

@Vge0rge Vge0rge Awaiting requested review from Vge0rge

@joerchan joerchan Awaiting requested review from joerchan

@SebastianBoe SebastianBoe Awaiting requested review from SebastianBoe

@mswarowsky mswarowsky Awaiting requested review from mswarowsky

@tomchy tomchy Awaiting requested review from tomchy

@ludvigsj ludvigsj Awaiting requested review from ludvigsj

@nordic-auko nordic-auko Awaiting requested review from nordic-auko nordic-auko is a code owner

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

@coderbyheart coderbyheart Awaiting requested review from coderbyheart

@lemrey lemrey Awaiting requested review from lemrey

@muraliThokala muraliThokala Awaiting requested review from muraliThokala

@bama-nordic bama-nordic Awaiting requested review from bama-nordic

@wentong-li wentong-li Awaiting requested review from wentong-li

@hubertmis hubertmis Awaiting requested review from hubertmis

@kkasperczyk-no kkasperczyk-no Awaiting requested review from kkasperczyk-no

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

@nordicjm nordicjm Awaiting requested review from nordicjm

@krish2718 krish2718 Awaiting requested review from krish2718

@jukkar jukkar Awaiting requested review from jukkar

@rado17 rado17 Awaiting requested review from rado17

@sachinthegreen sachinthegreen Awaiting requested review from sachinthegreen

@MirkoCovizzi MirkoCovizzi Awaiting requested review from MirkoCovizzi

@edmont edmont Awaiting requested review from edmont

@mariuszpos mariuszpos Awaiting requested review from mariuszpos

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

@grho grho Awaiting requested review from grho

@ihansse ihansse Awaiting requested review from ihansse

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

@maciejbaczmanski maciejbaczmanski Awaiting requested review from maciejbaczmanski

@PerMac PerMac Awaiting requested review from PerMac

@katgiadla katgiadla Awaiting requested review from katgiadla

@milewr milewr Awaiting requested review from milewr

Assignees
No one assigned
Labels
auto-upmerge ble mesh Label for ble mesh PRbot. Add this if PR is related to ble mesh and you need to get review. CI-force-downstream doc-required PR must not be merged without tech writer approval. manifest manifest-find-my manifest-homekit manifest-hostap manifest-matter manifest-mbedtls manifest-mcuboot manifest-memfault-firmware-sdk manifest-nrf-802154 manifest-nrfxlib manifest-sidewalk manifest-trusted-firmware-m manifest-zephyr wifi-qa-required Needs an Approval from Wi-Fi QA team before merging.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.