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

Recent versions of Android support EPOLLEXCLUSIVE #1567

Merged
merged 1 commit into from Dec 22, 2021

Conversation

rtzoeller
Copy link
Collaborator

Corresponding libc change.

Enable the epoll tests on Android, because they are passing.

@rtzoeller
Copy link
Collaborator Author

I need to update the changelog, but that is effectively blocked on #1498 since a new section is required.

@asomers
Copy link
Member

asomers commented Oct 16, 2021

LGTM. Go ahead and add the CHANGELOG section. We don't need to wait for #1498 to merge this; it won't cause a bad merge collision.

rtzoeller added a commit to rtzoeller/nix that referenced this pull request Oct 16, 2021
@asomers
Copy link
Member

asomers commented Oct 16, 2021

Looks good. Would you mind squashing your commits?

@rtzoeller
Copy link
Collaborator Author

Looks good. Would you mind squashing your commits?

Done.

@asomers asomers added this to the 0.24.0 milestone Oct 16, 2021
Copy link
Member

@asomers asomers left a comment

Choose a reason for hiding this comment

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

Looks good. But let's delay merging until after the 0.23.1 PRs.

@asomers
Copy link
Member

asomers commented Dec 21, 2021

@rtzoeller needs a rebase

Enable epoll tests on Android, because they are passing.
@rtzoeller
Copy link
Collaborator Author

bors r+

@bors bors bot merged commit 78f2301 into nix-rust:master Dec 22, 2021
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.

None yet

2 participants