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

all: reset master to remove accidental merge CL #41718

Closed
dmitshur opened this issue Sep 30, 2020 · 4 comments
Closed

all: reset master to remove accidental merge CL #41718

dmitshur opened this issue Sep 30, 2020 · 4 comments
Assignees
Labels

Comments

@dmitshur
Copy link
Member

@dmitshur dmitshur commented Sep 30, 2020

The merge CL 258525 was accidentally merged into the master branch, rather than the intended branch.

I'll rewrite history to revert master to the parent commit, which is 846dce9d05f19a1f53465e62a304dea21b99f910.

@dmitshur dmitshur self-assigned this Sep 30, 2020
@dmitshur dmitshur pinned this issue Sep 30, 2020
@dmitshur
Copy link
Member Author

@dmitshur dmitshur commented Sep 30, 2020

This is now done.

If you've submitted a CL to master branch recently and it's not there now, please re-send it.

@gopherbot
Copy link

@gopherbot gopherbot commented Oct 1, 2020

Change https://golang.org/cl/258677 mentions this issue: syscall: use correct cmsg alignment for netbsd/arm64

@networkimprov
Copy link

@networkimprov networkimprov commented Oct 1, 2020

What was the HEAD right before history was rewritten?

gopherbot pushed a commit that referenced this issue Oct 1, 2020
netbsd/arm64 requires 128-bit alignment for cmsgs.

Re-submit of CL 258437 which was dropped due to #41718.

Change-Id: I898043d79f513bebe1a5eb931e7ebd8e291a5aec
Reviewed-on: https://go-review.googlesource.com/c/go/+/258677
Trust: Tobias Klauser <tobias.klauser@gmail.com>
Trust: Benny Siegert <bsiegert@gmail.com>
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Benny Siegert <bsiegert@gmail.com>
@dmitshur
Copy link
Member Author

@dmitshur dmitshur commented Oct 1, 2020

It was previously 48e542e58588bc75faacd63439f40e57db80b2f1 at the time of the force push.

From looking, the only CL I see dropped was CL 258437. It was re-sent as CL 258677.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked pull requests

Successfully merging a pull request may close this issue.

None yet
3 participants
You can’t perform that action at this time.