Skip to content

Conversation

@pabigot
Copy link
Contributor

@pabigot pabigot commented Mar 4, 2021

Make clear that modified commits or new commits that incorporate material from other commits must retain the Signed-off-by: lines from the original author(s), to preserve the chain-of-responsibility that affirms the content meets Zephyr's licensing criteria.

Context: #32734 (comment)

Copy link
Member

@nashif nashif left a comment

Choose a reason for hiding this comment

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

This is already covered here:

https://docs.zephyrproject.org/latest/contribute/index.html#notes

the cherry-picked commits or portions of a commit shall preserve the original sign-off messages and the author identity.

Having the same message repeated in 2 different places using different language is just confusing. I do not see a reason for the additional note.

Make clear that modified commits or new commits that incorporate
material from other commits must retain the Signed-off-by: lines from
the original author(s), to preserve the chain-of-responsibility that
affirms the content meets Zephyr's licensing criteria.

Signed-off-by: Peter Bigot <[email protected]>
@pabigot pabigot force-pushed the nordic/20210304a branch from 08597e9 to 0c82738 Compare March 5, 2021 11:56
@pabigot
Copy link
Contributor Author

pabigot commented Mar 5, 2021

Having the same message repeated in 2 different places using different language is just confusing. I do not see a reason for the additional note.

I've added a back-link to the DCO to the new text; otherwise I'm gonna let @carlescufi determine whether to pursue this. The context comment provides evidence that having it only at the DCO was not sufficient.

Copy link
Member

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

LGTM with the link-back now. Thanks!

@carlescufi carlescufi requested a review from nashif April 19, 2021 12:12
@github-actions
Copy link

This pull request has been marked as stale because it has been open (more than) 60 days with no activity. Remove the stale label or add a comment saying that you would like to have the label removed otherwise this pull request will automatically be closed in 14 days. Note, that you can always re-open a closed pull request at any time.

@github-actions github-actions bot added the Stale label Jul 14, 2021
@github-actions github-actions bot closed this Jul 29, 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