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

add various PTP_ consts #4114

Merged
merged 1 commit into from
Nov 20, 2024
Merged

Conversation

folkertdev
Copy link
Contributor

@folkertdev folkertdev commented Nov 19, 2024

The constants from #3865, hopefully.

Description

Sources

Checklist

  • Relevant tests in libc-test/semver have been updated
  • No placeholder or unstable values like *LAST or *MAX are
    included (see #3131)
  • Tested locally (cd libc-test && cargo test --target mytarget);
    especially relevant for platforms that may not be checked in CI

r? @tgross35

@bors
Copy link
Contributor

bors commented Nov 20, 2024

☔ The latest upstream changes (presumably #4113) made this pull request unmergeable. Please resolve the merge conflicts.

@folkertdev folkertdev force-pushed the add-ptp-clock-consts branch 2 times, most recently from 236f488 to 5a41ff2 Compare November 20, 2024 10:59
We cannot (apparently) use a type alias for `ptp_pin_function` because
CI is unhappy with that (e.g. https://github.com/rust-lang/libc/actions/runs/11921706273/job/33226419934?pr=4114)

We can always add that type alias later; it's not a breaking change
@folkertdev folkertdev marked this pull request as ready for review November 20, 2024 16:07
@folkertdev
Copy link
Contributor Author

this is everything except for ptp_clock_caps and the constants related to it. That stuff still caused garando errors, so I'll try that in tiny steps elsewhere to figure out what the problem is.

@tgross35 tgross35 added this pull request to the merge queue Nov 20, 2024
@tgross35 tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Nov 20, 2024
Merged via the queue into rust-lang:main with commit 99248c7 Nov 20, 2024
45 checks passed
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 25, 2024
We cannot (apparently) use a type alias for `ptp_pin_function` because
CI is unhappy with that (e.g. https://github.com/rust-lang/libc/actions/runs/11921706273/job/33226419934?pr=4114)

We can always add that type alias later; it's not a breaking change

(backport <rust-lang#4114>)
(cherry picked from commit a2ec642)
@tgross35 tgross35 mentioned this pull request Nov 25, 2024
@tgross35 tgross35 added stable-applied This PR has been cherry-picked to libc's stable release branch and removed stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Nov 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
O-linux O-unix S-waiting-on-review stable-applied This PR has been cherry-picked to libc's stable release branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants