PSP Integration candidate: Caelum-rc4+dev65 #421
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Correct the round-up memory alignment calculation in the stub "malloc" routine.
Fix #418, malloc stub memalign calculation
dzbaker
added a commit
to nasa/cFS
that referenced
this pull request
Dec 5, 2023
*Combines:* to_lab v2.5.0-rc4+dev71 ci_lab v2.5.0-rc4+dev77 cFE v7.0.0-rc4+dev427 PSP v1.6.0-rc4+dev102 osal v6.0.0-rc4+dev243 **Includes:** *to_lab* - nasa/to_lab#173 *ci_lab* - nasa/ci_lab#157 - nasa/ci_lab#159 - nasa/ci_lab#161 *cFE* - nasa/cFE#2411 - nasa/cFE#2409 - nasa/cFE#2373 - nasa/cFE#2466 - nasa/cFE#2468 - nasa/cFE#2470 *PSP* - nasa/PSP#421 *osal* - nasa/osal#1413 Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com> Co-authored by: Isaac Rowe <irowebbn@users.noreply.github.com> Co-authored by: Jacob Hageman <skliper@users.noreply.github.com> Co-authored by: Frank Kühndel <frank-kue@users.noreply.github.com>
dzbaker
added a commit
to nasa/cFS
that referenced
this pull request
Dec 5, 2023
*Combines:* to_lab v2.5.0-rc4+dev71 ci_lab v2.5.0-rc4+dev77 cFE v7.0.0-rc4+dev424 PSP v1.6.0-rc4+dev102 osal v6.0.0-rc4+dev243 **Includes:** *to_lab* - nasa/to_lab#173 *ci_lab* - nasa/ci_lab#157 - nasa/ci_lab#159 - nasa/ci_lab#161 *cFE* - nasa/cFE#2409 - nasa/cFE#2373 - nasa/cFE#2466 - nasa/cFE#2468 - nasa/cFE#2470 *PSP* - nasa/PSP#421 *osal* - nasa/osal#1413 Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com> Co-authored by: Isaac Rowe <irowebbn@users.noreply.github.com> Co-authored by: Jacob Hageman <skliper@users.noreply.github.com> Co-authored by: Frank Kühndel <frank-kue@users.noreply.github.com>
dzbaker
added a commit
to nasa/cFS
that referenced
this pull request
Dec 5, 2023
*Combines:* to_lab v2.5.0-rc4+dev71 ci_lab v2.5.0-rc4+dev77 cFE v7.0.0-rc4+dev424 PSP v1.6.0-rc4+dev102 osal v6.0.0-rc4+dev243 **Includes:** *to_lab* - nasa/to_lab#173 *ci_lab* - nasa/ci_lab#157 - nasa/ci_lab#159 - nasa/ci_lab#161 *cFE* - nasa/cFE#2409 - nasa/cFE#2373 - nasa/cFE#2466 - nasa/cFE#2468 - nasa/cFE#2470 *PSP* - nasa/PSP#421 *osal* - nasa/osal#1413 Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com> Co-authored by: Isaac Rowe <irowebbn@users.noreply.github.com> Co-authored by: Jacob Hageman <skliper@users.noreply.github.com> Co-authored by: Frank Kühndel <frank-kue@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist (Please check before submitting)
Describe the contribution
Testing performed
cFS Bundle Checks
PSP Checks
Expected behavior changes
See PRs
System(s) tested on
Ubuntu 22.04
Additional context
Add any other context about the contribution here.
Third party code
If included, identify any third party code and provide text file of license
Contributor Info - All information REQUIRED for consideration of pull request
@jphickey