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

[v3.6-branch] doc: services: device_mgmt: mcumgr: Correct license for tool #78929

Open
wants to merge 1 commit into
base: v3.6-branch
Choose a base branch
from

Conversation

nordicjm
Copy link
Collaborator

@nordicjm nordicjm commented Sep 24, 2024

Corrects an incorrect license for a tool (backport of #78923).

Fixes #78927

@nordicjm nordicjm linked an issue Sep 24, 2024 that may be closed by this pull request
@zephyrbot zephyrbot added Trivial Changes that can be reviewed by anyone, i.e. doc changes, minor build system tweaks, etc. area: mcumgr labels Sep 24, 2024
kartben
kartben previously approved these changes Sep 24, 2024
Copy link
Member

@henrikbrixandersen henrikbrixandersen left a comment

Choose a reason for hiding this comment

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

This needs to go in as a backport of #78923 once it is merged.

@nordicjm
Copy link
Collaborator Author

This needs to go in as a backport of #78923 once it is merged.

The backport will not work because the whole table is different in main vs 3.x

@henrikbrixandersen
Copy link
Member

This needs to go in as a backport of #78923 once it is merged.

The backport will not work because the whole table is different in main vs 3.x

It still needs to go into main first. If the automatic backport fails, a manual backport must be done.

@nordicjm
Copy link
Collaborator Author

This needs to go in as a backport of #78923 once it is merged.

The backport will not work because the whole table is different in main vs 3.x

It still needs to go into main first. If the automatic backport fails, a manual backport must be done.

Sure, the main one needs accepting first, but this is fully compliant with the process on https://github.com/zephyrproject-rtos/zephyr/wiki/Change-Control-and-Backports-to-stable-branches

Changes can be submitted to a stable and a released branch in 2 ways:
Directly submitted to the branch as a pull request with the Backport label

@nordicjm nordicjm added the Backport Backport PR and backport failure issues label Sep 24, 2024
@henrikbrixandersen
Copy link
Member

Sure, but not like this. This provides no traceability on where this change occurred in main.

@nordicjm
Copy link
Collaborator Author

nordicjm commented Sep 24, 2024

Sure, but not like this. This provides no traceability on where this change occurred in main.

Nothing is required to go back to main that I've ever seen, it just needs to link to an issue. @nashif can you comment on what is needed? E.g. ed1db96

@henrikbrixandersen
Copy link
Member

As an example of a manually submitted PR against a release branch that maintains traceability to main:

Notice how both the PR description and the Git commit log (produced with git cherry-pick -x ... contains references to the corresponding commits to main.

@nordicjm
Copy link
Collaborator Author

As an example of a manually submitted PR against a release branch that maintains traceability to main:

* [[Backport v3.6-branch] Bluetooth: RFCOMM: check the validity of received frame #78860](https://github.com/zephyrproject-rtos/zephyr/pull/78860)

Notice how both the PR description and the Git commit log (produced with git cherry-pick -x ... contains references to the corresponding commits to main.

So top commit from v3.6-branch 2c2540e

    zephyr: Add zero-len check for utf8_trunc
    
    The function did not check if the provided string had a zero
    length before starting to truncate, which meant that last_byte_p
    could possible have pointed to the value before the string.
    
    Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>

What here does any of that?

@henrikbrixandersen
Copy link
Member

What here does any of that?

That commit was a result of having to modify the original commit as per the discussion in #78286 (which does contain a reference to the original PR introducing the change on main).

@henrikbrixandersen henrikbrixandersen requested a review from a team September 24, 2024 14:39
@nordicjm
Copy link
Collaborator Author

What here does any of that?

That commit was a result of having to modify the original commit as per the discussion in #78286 (which does contain a reference to the original PR introducing the change on main).

Exactly, so I reference the issue here, the issue itself references all 3 items, the backport here is done manually because the table in main has moved on - just as the PR you referenced there, so what is different here?

@henrikbrixandersen
Copy link
Member

Exactly, so I reference the issue here, the issue itself references all 3 items, the backport here is done manually because the table in main has moved on - just as the PR you referenced there, so what is different here?

Just what I described in my initial comment (#78929 (review)). This needs to be a backport of the commit to main. We can't have this go into a release branch before being accepted and merged on main - and your PR description links to an issue but no where mentions any trace of this being submitted against the main branch as well.

Corrects an incorrect license for a tool

Fixes zephyrproject-rtos#78927

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@henrikbrixandersen henrikbrixandersen added this to the v3.6.1 milestone Sep 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: mcumgr Backport Backport PR and backport failure issues Trivial Changes that can be reviewed by anyone, i.e. doc changes, minor build system tweaks, etc.
Projects
Status: Ready
Development

Successfully merging this pull request may close these issues.

doc: mcumgr: Wrong license for mcumgr-client
5 participants