Repository navigation
Conversation
Port the nightly upstream rebase from the Xen tree to the kernel. Every night at 03:23 UTC, Claude rebases edera/mainline onto torvalds master, following .automation/skills/upstream-rebase/SKILL.md: it replays the series, resolves conflicts, fixes what the replay broke, builds, audits upstream fixes that meet the series, and writes a report. The model's own account of its result decides nothing. It runs with a read-only token; its branch leaves the job as a git bundle and is judged by scripts taken from the commit the run started from: - verify-upstream-rebase.sh (unchanged from Xen) proves the series sits on the upstream tip, is linear, kept every commit, and moved the tree by exactly the upstream delta; - kernel-build.sh builds x86_64 and arm64 vmlinux with the Hyper-V, Xen dom0/backend, PV-IOMMU, NUMA affinity and OpenPaX options built in, and fails if olddefconfig drops any of them. If both pass and the report asks for no decision, edera/mainline is force-pushed with a lease pinned to the tip the rebase started from, and the old tip is kept as a backup branch. Otherwise the result goes up as a pull request carrying the report, and approving it lands it (rebase-land.yml). A night with no result opens an issue. Every job clones blobless: the jobs need the kernel's commit graph but only the contents of the files the series and upstream touch. The same commit goes on both edera/6.18-lts and edera/mainline: the schedule runs only from the default branch, but approving a rebase pull request runs the land workflow from edera/mainline.
Author
|
Mainline copy of this commit: #12. Land both together. |
Author
|
Closed: scope is edera/mainline only (#12). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Ports the nightly upstream rebase from our Xen tree to the kernel, covering edera/mainline only for now: every night at 03:23 UTC, Claude rebases
edera/mainlineonto torvaldsmaster.This is one of two PRs with the identical commit:
edera/6.18-lts: the default branch, the only place a scheduled workflow runs from;edera/mainline: approving a rebase PR runsrebase-land.ymlfrom the PR's merge ref, so mainline needs a copy for approve-to-land to work.Keep the two copies the same.
How it works
Same shape as Xen. Claude runs with a read-only token and can't push. Its branch leaves the job as a git bundle and is judged independently, using scripts from the commit the run started from:
verify-upstream-rebase.sh(unchanged from Xen): on the upstream tip, linear, no commit lost or gained, and the tree moved by exactly the upstream delta;kernel-build.sh: x86_64 and arm64vmlinuxwith the Hyper-V, Xen dom0/backend, PV-IOMMU, NUMA affinity and OpenPaX options built in. It fails ifolddefconfigdrops any of them.If everything is clean and Claude's report raises no question,
edera/mainlineis force-pushed. The push is pinned to the old tip, and the old tip is kept as a backup branch. Otherwise the result becomes arebase/edera-mainline/...PR, and approving it lands it. A night with no result opens an issue.Differences from Xen
filter: blob:none), because full kernel history is several GB..gitignoreignores dot-directories, so new files under.github/or.automation/needgit add -f. Scratch dirs (.rebase-tools/,.rebase-scratch/) are ignored for free.Fixes:, CVE,Cc: stable) that touch files the series touches.Testing
actionlintis clean.shellcheckhasn't run yet; the self-test workflow will be its first run.kernel-build.shbuilds both current trees on both architectures locally.workflow_dispatchrun.Needs before it runs
The same repo settings as Xen:
REBASE_APP_CLIENT_ID/REBASE_APP_PRIVATE_KEY, with bypass onedera/mainline;ANTHROPIC_*variables, with a federation rule that accepts a scheduled run onedera/6.18-lts.The 6.18-lts rebase and the mainline → 6.18 backport flow are written but held back for a later PR.