Skip to content

[0.2] Backports #4318

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

Merged
merged 6 commits into from
Mar 11, 2025
Merged

[0.2] Backports #4318

merged 6 commits into from
Mar 11, 2025

Conversation

tgross35
Copy link
Contributor

@tgross35 tgross35 commented Mar 11, 2025

tammela and others added 6 commits March 11, 2025 08:19
Signed-off-by: Pedro Tammela <[email protected]>

(backport <rust-lang#4317>)
(cherry picked from commit 4776e0f)
Signed-off-by: Pedro Tammela <[email protected]>

(backport <rust-lang#4317>)
(cherry picked from commit 1ae6552)
This flag has been introduced in Linux kernel 6.3:
torvalds/linux@6fd7353

(backport <rust-lang#4316>)
(cherry picked from commit 61c4a0a)
The devmem constants requires headers >= 6.12 on gnu libc.
Musl hardcodes these constants into "sys/socket.h", which are not yet present.

For reference:
   https://elixir.bootlin.com/linux/v6.13.5/source/include/uapi/asm-generic/socket.h#L142

Signed-off-by: Pedro Tammela <[email protected]>

(backport <rust-lang#4299>)
(cherry picked from commit ae98edd)
(backport <rust-lang#4310>)
(cherry picked from commit f3c54e8)
@rustbot
Copy link
Collaborator

rustbot commented Mar 11, 2025

@tgross35: no appropriate reviewer found, use r? to override

@rustbot
Copy link
Collaborator

rustbot commented Mar 11, 2025

Some changes occurred in the Android module

cc @maurer

@tgross35 tgross35 enabled auto-merge March 11, 2025 08:23
@tgross35 tgross35 added this pull request to the merge queue Mar 11, 2025
Merged via the queue into rust-lang:libc-0.2 with commit b988ca5 Mar 11, 2025
43 checks passed
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.

5 participants