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.

Sign up for GitHub

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

Jump to bottom

redox: correct EPOLL constants #3685

Merged
merged 1 commit into from
Oct 15, 2024
Merged

redox: correct EPOLL constants #3685

merged 1 commit into from
Oct 15, 2024
+16 −16

Conversation

jackpot51
Copy link
Contributor

@rustbot
Copy link
Collaborator

rustbot commented May 6, 2024

r? @JohnTitor

rustbot has assigned @JohnTitor.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@jackpot51 jackpot51 mentioned this pull request May 6, 2024
Merged
@JohnTitor
Copy link
Member

Could you rebase to make CI green?

@tgross35 tgross35 enabled auto-merge August 12, 2024 10:41
@tgross35 tgross35 disabled auto-merge August 13, 2024 00:28
@tgross35
Copy link
Contributor

@jackpot51 gentle nudge, as mentioned above this just needs a rebase

@rustbot author

@tgross35 tgross35 added the stable-applied This PR has been cherry-picked to libc's stable release branch label Aug 13, 2024
@tgross35 tgross35 added stable-nominated This PR should be considered for cherry-pick to libc's stable release branch and removed stable-applied This PR has been cherry-picked to libc's stable release branch labels Aug 20, 2024
@jackpot51
Copy link
Contributor Author

Sorry for the delay, I have rebased it now.

tgross35
tgross35 approved these changes Oct 15, 2024
View reviewed changes
Copy link
Contributor

@tgross35 tgross35 left a comment

Choose a reason for hiding this comment

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

Thanks!

@tgross35 tgross35 added this pull request to the merge queue Oct 15, 2024
Merged via the queue into rust-lang:main with commit a0df3e7 Oct 15, 2024
40 of 41 checks passed
@tgross35
Copy link
Contributor

Oh, looks like no backport is needed since these were already in 0.2 from #3686.

@tgross35 tgross35 added stable-applied This PR has been cherry-picked to libc's stable release branch and removed stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Oct 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tgross35 tgross35 tgross35 approved these changes

Assignees

@JohnTitor JohnTitor

Labels
S-waiting-on-author stable-applied This PR has been cherry-picked to libc's stable release branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jackpot51 @rustbot @JohnTitor @tgross35