linux_mptcp: 0.91.2 -> 0.91.3 (kernel 4.1.38) #24253
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
|
Hi @7c6f434c, thank you for merging this :-). I wonder why the two "Merge branch 'master' into mptcp-v91.3" were needed. It looks ugly from my point of view. |
|
Because I hoped that GitHub editor works and was in the middle of
a mass-triage-merge. Yours was the first PR where I used the editor to
resolve conflicts (because it is marginally less effort and on 10
conflict resolutions out of 40 merges this marginal improvement reduces
the sanity damage).
I still do not know _what_ I did wrong, but all subsequent merges using
web editor went fine, so apparently your PR got unlucky, sorry.
|
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.
[X] Tested on NixOS