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

[nrf fromlist] manifest: hal_nordic update #2208

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[nrf fromlist] manifest: hal_nordic update #2208

wants to merge 1 commit into from
+1 −1

Conversation

JuhaKortesalmi
Copy link

@JuhaKortesalmi JuhaKortesalmi commented Oct 31, 2024 •
edited
Loading

Upstream PR #: 80657

@NordicBuilder NordicBuilder mentioned this pull request Oct 31, 2024
Open
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Oct 31, 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@5c8d109 (master) zephyrproject-rtos/hal_nordic#239 zephyrproject-rtos/hal_nordic#239/files

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

@JuhaKortesalmi JuhaKortesalmi force-pushed the NRFX-6062_SW_MA_Power_Seq branch 13 times, most recently from 9275ea7 to 2faa7b1 Compare November 7, 2024 09:07
carlescufi
carlescufi requested changes Nov 8, 2024
View reviewed changes
Copy link
Contributor

@carlescufi carlescufi left a comment

Choose a reason for hiding this comment

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

We cannot pull a change that points to a PR

@JuhaKortesalmi JuhaKortesalmi changed the title [nrf fromlist] modules: hal_nordic: NRFS support for P11 power switch. [nrf fromlist] manifest: hal_nordic update Nov 8, 2024
@JuhaKortesalmi JuhaKortesalmi force-pushed the NRFX-6062_SW_MA_Power_Seq branch 2 times, most recently from c203eb4 to daef1a1 Compare November 11, 2024 09:44
@57300
Copy link
Contributor

57300 commented Nov 11, 2024

We cannot pull a change that points to a PR

We also cannot point to an unmerged SHA. PR zephyrproject-rtos/hal_nordic#239 needs to be merged first.

@JuhaKortesalmi
Copy link
Author

We cannot pull a change that points to a PR

We also cannot point to an unmerged SHA. PR zephyrproject-rtos/hal_nordic#239 needs to be merged first.

So there is conflict between comments, which one I choose, full SHA or "pull/PR/head"?

@57300
Copy link
Contributor

57300 commented Nov 13, 2024

We cannot pull a change that points to a PR

We also cannot point to an unmerged SHA. PR zephyrproject-rtos/hal_nordic#239 needs to be merged first.

So there is conflict between comments, which one I choose, full SHA or "pull/PR/head"?

You should use pull/#/head while the hal_nordic PR is still open. Only update to SHA after it's merged.
Right now you're using an "impostor" SHA from your own fork.

What @carlescufi meant is that we cannot merge this sdk-zephyr PR until the hal_nordic PR is merged.

@JuhaKortesalmi
[nrf fromlist] manifest: hal_nordic update
bd82441 
NRFS support for control P11 power switch.

Upstream PR #: 80657

Signed-off-by: Juha Kortesalmi <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@carlescufi carlescufi carlescufi approved these changes

At least 2 approving reviews are required to merge this pull request.

Assignees
No one assigned
Labels
DNM manifest manifest-hal_nordic
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@JuhaKortesalmi @NordicBuilder @57300 @carlescufi