Repository navigation
engine: place a carried mainline pick before its backport set - #208
Merged
Merged
Conversation
A backport set is made on top of the earlier sets. A mainline pick that supersedes the set can need those sets too. Put the pick at the set's position, so each patch of the series builds in order. Signed-off-by: Igor Pecovnik <igor@armbian.com>
This file contains hidden or 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
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.
Goal: each patch in a series builds in
series.conforder (bisect).A mainline pick that supersedes a
cve/backport set now goes at that set's position. The set was made on top of the earlier sets, and the pick can need them too.Result, with a local
--no-buildrun on 6.1 and 6.18:Tests: unit tests pass. A new test covers the order.