Skip to content

Conversation

@de-nordic
Copy link
Contributor

@de-nordic de-nordic commented Oct 22, 2021

The commit updates mcumgr revision to include backport of
345caab img_mgmt: fix callback parameter values
(backport-upstream-137-to-v2.7-branch)

Fixes #38502.

Signed-off-by: Dominik Ermel [email protected]

…38502

The commit updates mcumgr revision to include backport of
   345caab img_mgmt: fix callback parameter values
           (backport-upstream-137-to-v2.7-branch)

Signed-off-by: Dominik Ermel <[email protected]>
@github-actions
Copy link

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

Name Old Revision New Revision Diff
mcumgr zephyrproject-rtos/mcumgr@31a2aa9 zephyrproject-rtos/mcumgr@9ffebd5 (v2.7-branch) zephyrproject-rtos/[email protected]

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

@de-nordic
Copy link
Contributor Author

de-nordic commented Oct 22, 2021

@cfriedt @carlescufi @lairdjm

I have not found any documentation of backporting fixes to zephyr modules so I have copied what we do in 2.7 for mcumgr.

I have created v2.7-branch in mcumgr (https://github.com/zephyrproject-rtos/mcumgr/tree/v2.7-branch) that points to the mcumg sha that is used by v2.7-branch of the Zephyr (https://github.com/zephyrproject-rtos/zephyr/blob/v2.7-branch/west.yml#L164).
Then I have created backport branch that includes the requested fix (Zephyr issue: #38502, mcumgr upstream PR apache/mynewt-mcumgr#137) https://github.com/zephyrproject-rtos/mcumgr/tree/backport-upstream-137-to-v2.7-branch and merged it to the v2.7-branch of mcumgr.

This is request to update Zephyr 2.7 west to point to the https://github.com/zephyrproject-rtos/mcumgr/commits/v2.7-branch sha zephyrproject-rtos/mcumgr@9ffebd5.

Is this the right way to proceed with backporting the fix?

The approach would be replacing closed #39101

@carlescufi
Copy link
Member

@de-nordic what you have done is excellent practice. No objections at all, great job.

@de-nordic
Copy link
Contributor Author

@de-nordic what you have done is excellent practice. No objections at all, great job.

Thanks! I am changing this as ready for review.

@de-nordic de-nordic marked this pull request as ready for review October 22, 2021 12:55
@cfriedt cfriedt merged commit dff331a into zephyrproject-rtos:v2.7-branch Oct 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants