Nanostack+mbed-client libservice update #4715
Conversation
…from 6444c8a..854505d 854505d Introduce object oriented dynmemLIB 27bae6b Merge pull request ARMmbed#59 from ARMmbed/fix_yotta_deps ff45891 Add dependency on mbed-trace git-subtree-dir: features/FEATURE_COMMON_PAL/nanostack-libservice git-subtree-split: 854505d0191e428c07eb25fc9630dc05b21d5a47
* commit '0613e29fde32daa609eb6ae4ad785112b8fd9729': Squashed 'features/FEATURE_COMMON_PAL/nanostack-libservice/' changes from 6444c8a..854505d
|
FYI @SeppoTakalo, @adbridge, @0xc0170 |
|
@kjbracey-arm Hi Kevin if "Merge commit '0613e29fde32daa609eb6ae4ad785112b8fd9729'" , if this is actually a merge commit could you please replace with a rebase as merge commits cause problems with our automated release tools. Thanks |
|
It is a merge commit - a necessary artifact of the git subtree maintenance system already in use for this directory. The last few FEATURE_COMMON_PAL and lwIP core updates went through as similar git subtree merges, so I thought it was semi-routine by now. (The subtrees are working rather smoothly at our end at least - updates are super-easy to do and track). Many other pull requests have embedded merges in (from master), and I can't think why this merge commit should cause any worse problems than that. If it's because it's a merge right at the tip of the PR branch, would adding a dummy empty commit at the tip help workaround the issue? |
|
@kjbracey-arm The majority of the merge commits against master cause problems when they bring in all the commits from the merged branch. Our release script creates a patch from every commit on a PR and then applies to the release branch using git am, so this causes issue when a list of unrelated commits also get dragged in. Usually as a consequence of someone not keeping their local branches up to date and having to resolve conflicts . As it goes this one looks quite clean and may not cause us issues. |
|
Thanks for the info. There's no conflict in the merge, so git am on the other "content" squash commit should work fine. (These subtrees would not normally produce merge conflicts, as the target folder generally isn't being otherwise touched in this repository - it's just a copy of the master repo). |
|
@SeppoTakalo, @adbridge, @0xc0170 Could you review? |
|
/morph test-nightly |
|
@0xc0170 How about this PR ? When can this be merged and which release can we get it ? |
Waiting for CI, possibly the next one as previous PR |
Result: FAILUREYour command has finished executing! Here's what you wrote!
OutputExample Build failed! |
|
Restarting, Failure does not seem to be realted to this changeset, rather a script failure /morph test-nightly |
Result: SUCCESSYour command has finished executing! Here's what you wrote!
OutputAll builds and test passed! |
Update Nanostack/mbed-client libservice subtree - to provide new nsdynmemLIB API added in PelionIoT/nanostack-libservice#60
Changes are an API extension, so should be no backwards compatibility issues.
Update required for mbed-client - discussed with @yogpan01
Squashed patch contains only that nsdynmemLIB change, plus the Yotta change in PelionIoT/nanostack-libservice#59, which does not affect mbed-os.