Skip to content

merge queue: embarking main (f477cd8) and #304 together#317

Closed
mergify[bot] wants to merge 2 commits intomainfrom
mergify/merge-queue/ab3e9567cf
Closed

merge queue: embarking main (f477cd8) and #304 together#317
mergify[bot] wants to merge 2 commits intomainfrom
mergify/merge-queue/ab3e9567cf

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 3, 2026

🎉 This pull request has been checked successfully and will be merged soon. 🎉

Branch main (f477cd8) and #304 are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of #304.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue default for merge:

Required conditions to stay in the queue:

---
checking_base_sha: f477cd8911b4ecf1539188bc763ac7b3ba36fd29
previous_failed_batches: []
pull_requests:
  - number: 304
...

rpardini and others added 2 commits January 20, 2026 19:11
- some machines have no RTC at all, or an RTC with a failed battery
- in certain situations, ntpd fails with "Alarm Clock" when trying to do too-big a jump
- in this case, set system time to the date of the dhcpd binary and retry
- yet-another-case where systemd would have saved us from pain

Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
@mergify mergify bot closed this Feb 3, 2026
@mergify mergify bot deleted the mergify/merge-queue/ab3e9567cf branch February 3, 2026 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant