Skip to content

Bump to mono/corefx@f3815a9#18090

Merged
akoeplinger merged 1 commit intomono:masterfrom
steveisok:bump-corefx-backport-fixpathlength
Dec 9, 2019
Merged

Bump to mono/corefx@f3815a9#18090
akoeplinger merged 1 commit intomono:masterfrom
steveisok:bump-corefx-backport-fixpathlength

Conversation

@steveisok
Copy link
Contributor

Picks up mono/corefx#376

@akoeplinger
Copy link
Member

@monojenkins build Linux AArch64 Interpreter

@akoeplinger akoeplinger merged commit 4cefdcb into mono:master Dec 9, 2019
@steveisok
Copy link
Contributor Author

@monojenkins backport 2019-12

@steveisok
Copy link
Contributor Author

@monojenkins backport 2019-10

@monojenkins
Copy link
Contributor

@steveisok backporting to 2019-10 failed, the patch results in conflicts:

Applying: Bump to mono/corefx@f3815a9
Using index info to reconstruct a base tree...
M	external/corefx
Falling back to patching base and 3-way merge...
warning: Failed to merge submodule external/corefx (not checked out)
Auto-merging external/corefx
CONFLICT (submodule): Merge conflict in external/corefx
error: Failed to merge in the changes.
Patch failed at 0001 Bump to mono/corefx@f3815a9

Please backport manually!

steveisok pushed a commit to steveisok/mono that referenced this pull request Dec 9, 2019
akoeplinger pushed a commit that referenced this pull request Dec 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants