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

android: Add kernel/uapi/linux/neighbour.h constants #3278

Merged

Conversation

dragan-cecavac-nordsec
Copy link
Contributor

@rustbot
Copy link
Collaborator

rustbot commented Jun 16, 2023

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @JohnTitor (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

Copy link
Member

@JohnTitor JohnTitor left a comment

Choose a reason for hiding this comment

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

Thanks!

@JohnTitor
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jun 21, 2023

📌 Commit 983bdca has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jun 21, 2023

⌛ Testing commit 983bdca with merge ab80feb...

bors added a commit that referenced this pull request Jun 21, 2023
…eighbour, r=JohnTitor

android: Add kernel/uapi/linux/neighbour.h constants

Introduce Android constants defined in https://android.googlesource.com/platform/bionic/+/refs/heads/master/libc/kernel/uapi/linux/neighbour.h
@bors
Copy link
Contributor

bors commented Jun 21, 2023

💔 Test failed - checks-cirrus-freebsd-14

@dragan-cecavac-nordsec
Copy link
Contributor Author

Hi,
It seems that the failure is the same as with #3279 (comment) so I'll also just wait and hope for the best 🤞

@JohnTitor
Copy link
Member

Yeah, let's see if it's now fixed, @bors retry

@bors
Copy link
Contributor

bors commented Jun 24, 2023

⌛ Testing commit 983bdca with merge 4b4e8f1...

bors added a commit that referenced this pull request Jun 24, 2023
…eighbour, r=JohnTitor

android: Add kernel/uapi/linux/neighbour.h constants

Introduce Android constants defined in https://android.googlesource.com/platform/bionic/+/refs/heads/master/libc/kernel/uapi/linux/neighbour.h
@bors
Copy link
Contributor

bors commented Jun 24, 2023

💔 Test failed - checks-actions

@JohnTitor
Copy link
Member

s390x CI needs a tweak, let me fix.

@JohnTitor
Copy link
Member

@bors retry

@bors
Copy link
Contributor

bors commented Jun 24, 2023

⌛ Testing commit 983bdca with merge dab6ff6...

bors added a commit that referenced this pull request Jun 24, 2023
…eighbour, r=JohnTitor

android: Add kernel/uapi/linux/neighbour.h constants

Introduce Android constants defined in https://android.googlesource.com/platform/bionic/+/refs/heads/master/libc/kernel/uapi/linux/neighbour.h
@bors
Copy link
Contributor

bors commented Jun 24, 2023

💔 Test failed - checks-actions

@dragan-cecavac-nordsec
Copy link
Contributor Author

It looks to me like some of the definitions are too new for the test setup 😅
Referring to master vs Android 11:

For starters I could reduce the scope of the changes to cover the testable ones and further on we could see what could be done to widen the test scope, if you agree?

@JohnTitor
Copy link
Member

You can ignore tests for newer items, see

cfg.skip_const(move |name| {

A fixme comment describing available version(s) would be helpful when upgrading CI toolchains :)

@dragan-cecavac-nordsec
Copy link
Contributor Author

dragan-cecavac-nordsec commented Jun 27, 2023

Thank you, hopefully this should do.

When it comes to NDK versions listed under FIXME I simply checked the most recent sub-version. E.g. r22b in case of r22 and r25c in case of r25.
After the update, this PR will conflict with #3277. Whichever gets merged first, I can adjust the other.

@JohnTitor
Copy link
Member

Thanks! @bors r+

@bors
Copy link
Contributor

bors commented Jun 29, 2023

📌 Commit ebcb516 has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jun 29, 2023

⌛ Testing commit ebcb516 with merge 30a7a9f...

@bors
Copy link
Contributor

bors commented Jun 29, 2023

☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Approved by: JohnTitor
Pushing 30a7a9f to main...

@bors bors merged commit 30a7a9f into rust-lang:main Jun 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants