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.

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

[Sival, pwrmgr] Map test chip_sw_pwrmgr_sleep_sensor_ctrl_alert_wakeup #23345

Merged
merged 3 commits into from
May 30, 2024

Conversation

engdoreis
Copy link
Contributor

@engdoreis engdoreis commented May 28, 2024

This PR cherry-picks from #22723 to fix the test chip_sw_sensor_ctrl_ast_alerts as described in #22778.
I believe we should get this issue fixed on the test side, at least for now, and remove the change in case the fix is moved to the ROM_EXT.

engdoreis and others added 3 commits May 28, 2024 13:26
Clear prior events to start from a clean slate and prevent the test from
failing.

Signed-off-by: Luís Marques <[email protected]>
@engdoreis engdoreis requested a review from a team as a code owner May 28, 2024 12:42
@engdoreis engdoreis requested review from HU90m, moidx, jwnrt and pamaury and removed request for a team and HU90m May 28, 2024 12:42
@moidx moidx merged commit 7c3e04a into lowRISC:earlgrey_es_sival May 30, 2024
27 of 29 checks passed
@jwnrt jwnrt added CherryPick:master This PR should be cherry-picked to master CherryPick:earlgrey_1.0.0 This PR should be cherry-picked to earlgrey_1.0.0 labels Nov 15, 2024
Copy link

Backport failed for master, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin master
git worktree add -d .worktree/backport-23345-to-master origin/master
cd .worktree/backport-23345-to-master
git switch --create backport-23345-to-master
git cherry-pick -x 124c1a183212b4d454db97bb4336f45213a09253 947a46ffe2a861e57a7e9304f7b90fba08589de6 95a37f9a9a1095030d7d08309cc333ef3b1da279

1 similar comment
Copy link

Backport failed for master, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin master
git worktree add -d .worktree/backport-23345-to-master origin/master
cd .worktree/backport-23345-to-master
git switch --create backport-23345-to-master
git cherry-pick -x 124c1a183212b4d454db97bb4336f45213a09253 947a46ffe2a861e57a7e9304f7b90fba08589de6 95a37f9a9a1095030d7d08309cc333ef3b1da279

Copy link

Backport failed for earlgrey_1.0.0, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin earlgrey_1.0.0
git worktree add -d .worktree/backport-23345-to-earlgrey_1.0.0 origin/earlgrey_1.0.0
cd .worktree/backport-23345-to-earlgrey_1.0.0
git switch --create backport-23345-to-earlgrey_1.0.0
git cherry-pick -x 124c1a183212b4d454db97bb4336f45213a09253 947a46ffe2a861e57a7e9304f7b90fba08589de6 95a37f9a9a1095030d7d08309cc333ef3b1da279

1 similar comment
Copy link

Backport failed for earlgrey_1.0.0, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin earlgrey_1.0.0
git worktree add -d .worktree/backport-23345-to-earlgrey_1.0.0 origin/earlgrey_1.0.0
cd .worktree/backport-23345-to-earlgrey_1.0.0
git switch --create backport-23345-to-earlgrey_1.0.0
git cherry-pick -x 124c1a183212b4d454db97bb4336f45213a09253 947a46ffe2a861e57a7e9304f7b90fba08589de6 95a37f9a9a1095030d7d08309cc333ef3b1da279

@github-actions github-actions bot added the Manually CherryPick This PR should be manually cherry picked. label Nov 15, 2024
@jwnrt
Copy link
Contributor

jwnrt commented Nov 15, 2024

@engdoreis would you mind handling these backports?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CherryPick:earlgrey_1.0.0 This PR should be cherry-picked to earlgrey_1.0.0 CherryPick:master This PR should be cherry-picked to master Manually CherryPick This PR should be manually cherry picked.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants