Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert 4334 from development #4348

Merged
merged 4 commits into from
Apr 15, 2021
Merged

Conversation

mpg
Copy link
Contributor

@mpg mpg commented Apr 15, 2021

Revert #4334 that was incorrectly merged in development instead of development_3.0.

mpg added 4 commits April 15, 2021 12:27
This reverts commit 0961e3d.

This was merged by mistake in development instead of development_3.0.

Signed-off-by: Manuel Pégourié-Gonnard <[email protected]>
This reverts commit 9a86843.

This was merged by mistake in development instead of development_3.0.

Signed-off-by: Manuel Pégourié-Gonnard <[email protected]>
This reverts commit 48f6d0d.

This was merged by mistake in development instead of development_3.0.

Signed-off-by: Manuel Pégourié-Gonnard <[email protected]>
This reverts commit c75d9f5.

This was merged by mistake in development instead of development_3.0.

Signed-off-by: Manuel Pégourié-Gonnard <[email protected]>
@mpg mpg force-pushed the revert-4334-dev branch from 04a4a36 to 93c0847 Compare April 15, 2021 10:29
@gilles-peskine-arm gilles-peskine-arm self-requested a review April 15, 2021 12:12
@gilles-peskine-arm gilles-peskine-arm added bug needs-review Every commit must be reviewed by at least two team members, needs-reviewer This PR needs someone to pick it up for review labels Apr 15, 2021
Copy link
Contributor

@gilles-peskine-arm gilles-peskine-arm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I verified that the end result is identical to taking the commit at which #4334 was merged, namely 09c916a, and replaying the activity on development apart from the merge of #4334, namely, merging #4253.

Copy link
Contributor

@yanesca yanesca left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted the commits of #4334 and arrived at an identical result.

@yanesca yanesca added approved Design and code approved - may be waiting for CI or backports and removed needs-review Every commit must be reviewed by at least two team members, needs-reviewer This PR needs someone to pick it up for review labels Apr 15, 2021
@yanesca yanesca merged commit cbcefae into Mbed-TLS:development Apr 15, 2021
@mpg mpg deleted the revert-4334-dev branch April 16, 2021 07:43
daverodgman pushed a commit that referenced this pull request Apr 23, 2021
Revert 4334 from development
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Design and code approved - may be waiting for CI or backports bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants