Skip to content

[main] Apply three pull requests to main #3872

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 3 commits into from
Aug 29, 2024
Merged

[main] Apply three pull requests to main #3872

merged 3 commits into from
Aug 29, 2024

Conversation

tgross35
Copy link
Contributor

@tgross35 tgross35 commented Aug 28, 2024 •
edited
Loading

@rustbot
Copy link
Collaborator

rustbot commented Aug 28, 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

@tgross35 tgross35 enabled auto-merge August 28, 2024 21:17
@tgross35 tgross35 changed the title Apply four pull requests to main [main] Apply four pull requests to main Aug 28, 2024
@tgross35 tgross35 changed the title [main] Apply four pull requests to main [main] Apply three pull requests to main Aug 28, 2024
agg23 and others added 3 commits August 28, 2024 18:56
@agg23 @tgross35
xrOS support
41f7f37 
Swapped to visionOS target_os

(apply <rust-lang#3568> to `main`)
[ resolve conflicts - Trevor ]
(cherry picked from commit b5b0f69)
@lberrymage @tgross35
Add SYS_lseek and SYS_mmap for aarch64 Android
2b1ca4f 
Values are sourced from
https://android.googlesource.com/platform/bionic/+/0339184/libc/kernel/uapi/asm-generic/unistd.h.

(apply <rust-lang#3632> to `main`)
[ resolve conflicts - Trevor ]
(cherry picked from commit 0b08bd5)
@rtzoeller @tgross35
android: add FUTEX_LOCK_PI2
bf864e3 
(apply <rust-lang#3635> to `main`)
(cherry picked from commit fceb18e)
@tgross35 tgross35 added this pull request to the merge queue Aug 29, 2024
Merged via the queue into rust-lang:main with commit 812095c Aug 29, 2024
41 checks passed
@tgross35 tgross35 deleted the main-bamboo branch August 29, 2024 01:38
@bors bors mentioned this pull request Aug 29, 2024
Merged
@tgross35 tgross35 added the stable-unneeded This PR is applied to main but already exists on libc-0.2 label Mar 10, 2025
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@JohnTitor JohnTitor

Labels
S-waiting-on-review stable-unneeded This PR is applied to main but already exists on libc-0.2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@tgross35 @rustbot @JohnTitor @agg23 @lberrymage @rtzoeller