Skip to content

config/trees: sync stable-rc with kernel.org#1474

Merged
nuclearcat merged 3 commits into
mainfrom
sync-stable-branches
Apr 28, 2026
Merged

config/trees: sync stable-rc with kernel.org#1474
nuclearcat merged 3 commits into
mainfrom
sync-stable-branches

Conversation

@github-actions
Copy link
Copy Markdown

Automated sync of stable-rc.yaml with current kernel.org releases.

This PR was created automatically by the sync-stable-branches workflow.

@bhcopeland
Copy link
Copy Markdown
Member

bhcopeland commented Apr 27, 2026

Good bot.

The initial 7.0 release doesn't appear in releases.json, only 7.0.1 does, so we miss the new branch until the first stable point release.

@nuclearcat
Copy link
Copy Markdown
Member

@copilot resolve the merge conflicts in this pull request

Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 27, 2026

@copilot resolve the merge conflicts in this pull request

Merge conflicts resolved in 93c072b — the only conflict was output.txt, a CI build artifact that was accidentally committed and had since been deleted in main. Also added output.txt to .gitignore to prevent this from happening again.

Good bot.

The initial 7.0 release doesn't appear in releases.json, only 7.0.1 does, so we miss the new branch until the first stable point release.

Fixed in 93c072b — the regex in get_active_branches() was r"^(\d+)\.(\d+)\." which requires a trailing dot and therefore misses initial releases like 7.0 (no patch number). Changed to r"^(\d+)\.(\d+)" which matches both 7.0 and 7.0.1.

Warning

Firewall rules blocked me from connecting to one or more addresses (expand for details)

I tried to connect to the following addresses, but was blocked by firewall rules:

  • www.kernel.org
    • Triggering command: /usr/bin/curl curl -s REDACTED (dns block)

If you need me to access, download, or install something from one of these locations, you can either:

Copilot AI requested a review from nuclearcat April 27, 2026 19:36
@nuclearcat nuclearcat added this pull request to the merge queue Apr 27, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to a conflict with the base branch Apr 27, 2026
@nuclearcat
Copy link
Copy Markdown
Member

@copilot rebase

Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 28, 2026

@copilot rebase

Branch is now up to date with main (7a38714). The PR diff is clean — only the 3 intended changes: stable-rc.yaml (6.19→7.0), .gitignore (add output.txt), and the sync script regex fix.

@nuclearcat nuclearcat added this pull request to the merge queue Apr 28, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to a conflict with the base branch Apr 28, 2026
github-merge-queue Bot and others added 3 commits April 29, 2026 01:12
Co-authored-by: nuclearcat <1076310+nuclearcat@users.noreply.github.com>
… number

Co-authored-by: nuclearcat <1076310+nuclearcat@users.noreply.github.com>
@nuclearcat nuclearcat force-pushed the sync-stable-branches branch from 7a38714 to 5c13292 Compare April 28, 2026 22:12
@nuclearcat nuclearcat added this pull request to the merge queue Apr 28, 2026
Merged via the queue into main with commit 75c0c4a Apr 28, 2026
5 checks passed
@nuclearcat nuclearcat deleted the sync-stable-branches branch April 28, 2026 22:12
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.

3 participants