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

Consolodate the Linux *_SUPER_MAGIC constants. #2639

Merged
merged 4 commits into from
Jan 25, 2022

Conversation

sunfishcode
Copy link
Member

Move the Linux *_SUPER_MAGIC constants out of
android/uclibc/gnu-specific directories and into the common linux_like directory
so that they're available on all Linux-family platforms, and so that that all
Linux-family platforms have all the constants.

Move the Linux `*_SUPER_MAGIC` constants out of
android/uclibc/gnu-specific directories and into the common `linux_like` directory
so that they're available on all Linux-family platforms, and so that that all
Linux-family platforms have all the constants.
@rust-highfive
Copy link

r? @Amanieu

(rust-highfive has picked a reviewer for you, use r? to override)

@Amanieu
Copy link
Member

Amanieu commented Jan 21, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Jan 21, 2022

📌 Commit f7f0656 has been approved by Amanieu

bors added a commit that referenced this pull request Jan 21, 2022
…anieu

Consolodate the Linux `*_SUPER_MAGIC` constants.

Move the Linux `*_SUPER_MAGIC` constants out of
android/uclibc/gnu-specific directories and into the common `linux_like` directory
so that they're available on all Linux-family platforms, and so that that all
Linux-family platforms have all the constants.
@bors
Copy link
Contributor

bors commented Jan 21, 2022

⌛ Testing commit f7f0656 with merge df7bb3c...

@bors
Copy link
Contributor

bors commented Jan 21, 2022

💔 Test failed - checks-actions

@Amanieu
Copy link
Member

Amanieu commented Jan 21, 2022

I think this is the same as #2633: the musl version used in CI doesn't have the BINDERFS magic, which is causing the check to fail.

@Amanieu
Copy link
Member

Amanieu commented Jan 24, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Jan 24, 2022

📌 Commit d0891d9 has been approved by Amanieu

@bors
Copy link
Contributor

bors commented Jan 24, 2022

⌛ Testing commit d0891d9 with merge c0e0bf1...

bors added a commit that referenced this pull request Jan 24, 2022
…anieu

Consolodate the Linux `*_SUPER_MAGIC` constants.

Move the Linux `*_SUPER_MAGIC` constants out of
android/uclibc/gnu-specific directories and into the common `linux_like` directory
so that they're available on all Linux-family platforms, and so that that all
Linux-family platforms have all the constants.
@bors
Copy link
Contributor

bors commented Jan 24, 2022

💔 Test failed - checks-actions

@Amanieu
Copy link
Member

Amanieu commented Jan 24, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Jan 24, 2022

📌 Commit 4875c52 has been approved by Amanieu

@bors
Copy link
Contributor

bors commented Jan 24, 2022

⌛ Testing commit 4875c52 with merge 33464a4...

bors added a commit that referenced this pull request Jan 24, 2022
…anieu

Consolodate the Linux `*_SUPER_MAGIC` constants.

Move the Linux `*_SUPER_MAGIC` constants out of
android/uclibc/gnu-specific directories and into the common `linux_like` directory
so that they're available on all Linux-family platforms, and so that that all
Linux-family platforms have all the constants.
@bors
Copy link
Contributor

bors commented Jan 24, 2022

💔 Test failed - checks-actions

@Amanieu
Copy link
Member

Amanieu commented Jan 25, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Jan 25, 2022

📌 Commit 338ac98 has been approved by Amanieu

@bors
Copy link
Contributor

bors commented Jan 25, 2022

⌛ Testing commit 338ac98 with merge a769300...

@bors
Copy link
Contributor

bors commented Jan 25, 2022

☀️ Test successful - checks-actions, checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13
Approved by: Amanieu
Pushing a769300 to master...

@bors bors merged commit a769300 into rust-lang:master Jan 25, 2022
@sunfishcode sunfishcode deleted the sunfishcode/linux-super-magic branch January 25, 2022 04:23
@jirutka jirutka mentioned this pull request Feb 5, 2022
bors bot added a commit to nix-rust/nix that referenced this pull request May 7, 2022
1717: Define FsType constants for musl r=asomers a=jirutka

These constants are provided by Linux (linux/magic.h), not libc.

See rust-lang/libc#2639.

Co-authored-by: Jakub Jirutka <jakub@jirutka.cz>
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