Skip to content

[0.2] Backports#5074

Merged
JohnTitor merged 3 commits intorust-lang:libc-0.2from
JohnTitor:backport-20260424
Apr 23, 2026
Merged

[0.2] Backports#5074
JohnTitor merged 3 commits intorust-lang:libc-0.2from
JohnTitor:backport-20260424

Conversation

@JohnTitor
Copy link
Copy Markdown
Member

JohnTitor and others added 3 commits April 24, 2026 03:34
(cherry picked from commit 088a284)
Add `PR_SET_MEMORY_MERGE` and `PR_GET_MEMORY_MERGE` prctl constants for the linux target. These control [per-process opt-in to KSM](https://lwn.net/Articles/953141/) and have been available since kernel 6.4. They were already defined for the android target but missing from linux

(cherry picked from commit 545663c)
These are values for the flag parameter in the Apple-specific `kevent64`
syscall:

https://github.com/apple-oss-distributions/xnu/blob/f6217f891ac0bb64f3d375211650a4c1ff8ca1ea/bsd/sys/event.h#L138-L141
(cherry picked from commit 708f24e)
@rustbot rustbot added A-CI Area: CI-related items S-waiting-on-review labels Apr 23, 2026
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 23, 2026

⚠️ Warning ⚠️

  • Pull requests are usually filed against the main branch for this repo, but this one is against libc-0.2. Please double check that you specified the right target!

@JohnTitor JohnTitor enabled auto-merge April 23, 2026 18:44
@JohnTitor JohnTitor added this pull request to the merge queue Apr 23, 2026
Merged via the queue into rust-lang:libc-0.2 with commit 9db2eaa Apr 23, 2026
100 of 102 checks passed
@JohnTitor JohnTitor deleted the backport-20260424 branch April 23, 2026 19:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-CI Area: CI-related items

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants