-
Notifications
You must be signed in to change notification settings - Fork 3k
Rename nanostack configuration (.cfg) files #7780
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
Conversation
…..7963594 7963594 Merge branch 'release_internal' into release_external 9e31d11 Update apache license to config-files (ARMmbed#1781) b8f840c Merge branch 'release_internal' into release_external 9495d94 Rename cfg-files to h-files (ARMmbed#1780) git-subtree-dir: features/nanostack/sal-stack-nanostack git-subtree-split: 7963594
@SeppoTakalo , @kjbracey-arm , @deepakvenugopal , @mikter would you please review? |
@artokin Thanks for providing the PR. However, would you mind updating the commit such that the files that were moved don't appear as newly created files? It's the difference between doing a Doing |
Could you also update the commit description, since the commits indicate more changes than just those to fix the issue? |
@cmonr , all the files were changed similary using |
...huh. Interesting. I wonder if the squash commit could have something to do with it. |
It looks like, besides merges, there's only two commits on the subtree. Can you cherry-pick those commits onto a new branch based on master? This is required to make it into a patch release. Future subtree merges will not have any conflicts if the cherry-picked changes match. |
@artokin Conversely, if you don't mind on having this fix wait until 5.10, we can simply move this PR forward asis. |
@cmonr This change is applied here as a From Mbed OS release point of view, it needs to be threaded as a merge commit. Directly applying it as a patch won't work. Anna has been able to apply these changes to patch release as well, so I assume that it works. And I would prefer if this goes out into the patch release, as the export builds are broken currently. |
I thought Anna had had problems cherry-picking these subtree merge PRs in the past, although I reckon it should in theory possible by cherry-picking just the merge commit with the But as this follows the already-merged 5.10 release PR won't the 5.9 backport likely conflict anyway? So maybe it would be best to make a separate PR targeting the 5.9 branch. |
As @kjbracey-arm noted, if this is based on top of changes earmarked for 5.10 then yes we are likely to get merge conflicts, so a separate PR would be best. However I don't like this kind of thing happening in general... Should only be for urgent fixes. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is okay to go now
/morph build |
Build : SUCCESSBuild number : 2832 Triggering tests/morph test |
Exporter Build : SUCCESSBuild number : 2461 |
Test : SUCCESSBuild number : 2582 |
Me as well, will review the release label during today's gatekeeping |
As this PR is built on previous full release and is all subtree-y, this PR is not pickable to 5.9.6. But fear not, there's already a 5.9-rebased easily-pickable version here: #7789. |
/morph uvisor-test |
Rename nanostack configuration (.cfg) files
Description
Pull request type