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

NCS 2.6.0 rebase #1551

Merged
merged 0 commits into from
Mar 8, 2024
Merged

NCS 2.6.0 rebase #1551

merged 0 commits into from
Mar 8, 2024

Conversation

jfischer-no
Copy link
Contributor

No description provided.

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Mar 1, 2024 •
edited
Loading

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

Name Old Revision New Revision Diff
hal_nordic zephyrproject-rtos/hal_nordic@56e0b05 zephyrproject-rtos/hal_nordic@5470822 (master) zephyrproject-rtos/[email protected]
hal_nxp zephyrproject-rtos/hal_nxp@6904623 zephyrproject-rtos/hal_nxp@0463d6a zephyrproject-rtos/[email protected]
mbedtls zephyrproject-rtos/mbedtls@7053083 zephyrproject-rtos/mbedtls@66ed227 zephyrproject-rtos/[email protected]
mcuboot zephyrproject-rtos/mcuboot@0c0470e zephyrproject-rtos/mcuboot@f09e205 zephyrproject-rtos/[email protected]
nrf_hw_models zephyrproject-rtos/nrf_hw_models@a715dcc zephyrproject-rtos/nrf_hw_models@52d0b4b (main) zephyrproject-rtos/[email protected]
openthread zephyrproject-rtos/openthread@193e77e zephyrproject-rtos/openthread@7761b81 (main) zephyrproject-rtos/[email protected]
psa-arch-tests zephyrproject-rtos/psa-arch-tests@6a17330 zephyrproject-rtos/psa-arch-tests@2cadb02 (main) zephyrproject-rtos/[email protected]
tf-m-tests zephyrproject-rtos/tf-m-tests@a878426 zephyrproject-rtos/tf-m-tests@08a3158 (main) zephyrproject-rtos/[email protected]
trusted-firmware-m zephyrproject-rtos/trusted-firmware-m@33c0f47 (temporary_testing) zephyrproject-rtos/trusted-firmware-m@58d0b53 zephyrproject-rtos/[email protected]
uoscore-uedhoc zephyrproject-rtos/uoscore-uedhoc@5fe2cb6 zephyrproject-rtos/uoscore-uedhoc@150f4eb (zephyr) zephyrproject-rtos/[email protected]
zcbor zephyrproject-rtos/zcbor@67fd8bb zephyrproject-rtos/zcbor@d3093b5 (main) zephyrproject-rtos/[email protected]

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

@jfischer-no jfischer-no marked this pull request as ready for review March 1, 2024 14:11
@jfischer-no jfischer-no requested a review from a team as a code owner March 1, 2024 14:11
@jfischer-no jfischer-no force-pushed the pr-rebase-v2.6.0 branch 2 times, most recently from b2aebce to c494bf2 Compare March 4, 2024 11:33
rlubos
rlubos approved these changes Mar 5, 2024
View reviewed changes
Copy link
Contributor

@rlubos rlubos 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.

Zero-diff, commits seem to be squashed nicely, LGTM

@cvinayak
Copy link
Contributor

cvinayak commented Mar 5, 2024

Zero-diff, commits seem to be squashed nicely, LGTM

I did the below:

# cd zephyr
# git fetch [email protected]:jfischer-no/sdk-zephyr.git pr-rebase-v2.6.0
# git diff HEAD FETCH_HEAD

I have some differences related LTO and nrf-regtool 5.1.0 REQUIRED etc...

my HEAD is 3912101

@rlubos is there a different way to compare that you got no diff?

@cvinayak
Copy link
Contributor

cvinayak commented Mar 5, 2024

Zero-diff, commits seem to be squashed nicely, LGTM

I did the below:

# cd zephyr
# git fetch [email protected]:jfischer-no/sdk-zephyr.git pr-rebase-v2.6.0
# git diff HEAD FETCH_HEAD

I have some differences related LTO and nrf-regtool 5.1.0 REQUIRED etc...

my HEAD is 3912101

@rlubos is there a different way to compare that you got no diff?

Compared now with 8d93a16

No diff.

@NordicBuilder NordicBuilder mentioned this pull request Mar 5, 2024
Merged
@tmon-nordic
Copy link
Contributor

tmon-nordic commented Mar 6, 2024 •
edited
Loading

The current main, i.e. 8d93a16 is not tagged. It must be tagged before this PR is merged (force pushed).

@jfischer-no
Copy link
Contributor Author

I had to merge a few more PRs, should be in sync with sdk-zephyr/main, please recheck.

@jfischer-no jfischer-no merged commit d96769f into nrfconnect:main Mar 8, 2024
10 of 11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cvinayak cvinayak cvinayak approved these changes

@anangl anangl anangl approved these changes

@rlubos rlubos rlubos approved these changes

@tmon-nordic tmon-nordic tmon-nordic approved these changes

@carlescufi carlescufi Awaiting requested review from carlescufi

@gmarull gmarull Awaiting requested review from gmarull

@jukkar jukkar Awaiting requested review from jukkar

@de-nordic de-nordic Awaiting requested review from de-nordic

Assignees
No one assigned
Labels
CI-disable manifest manifest-hal_nordic manifest-hal_nxp manifest-mbedtls manifest-mcuboot manifest-nrf_hw_models manifest-openthread manifest-psa-arch-tests manifest-tf-m-tests manifest-trusted-firmware-m manifest-uoscore-uedhoc manifest-zcbor
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@jfischer-no @NordicBuilder @cvinayak @tmon-nordic @anangl @rlubos