From 75fd4e9f15776e45cf40736d64c8ab0966b2f705 Mon Sep 17 00:00:00 2001 From: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com> Date: Mon, 27 Apr 2026 10:22:40 +0000 Subject: [PATCH 1/3] config/trees: sync stable-rc with kernel.org --- config/trees/stable-rc.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/trees/stable-rc.yaml b/config/trees/stable-rc.yaml index 8609ce636..684d7e27b 100644 --- a/config/trees/stable-rc.yaml +++ b/config/trees/stable-rc.yaml @@ -23,6 +23,6 @@ build_configs: <<: *stable-rc branch: 'linux-6.18.y' - stable-rc_6.19: + stable-rc_7.0: <<: *stable-rc - branch: 'linux-6.19.y' + branch: 'linux-7.0.y' From 6797b809ddc0334e2c14ca37498fda148c5f8f0e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 27 Apr 2026 19:33:54 +0000 Subject: [PATCH 2/3] gitignore: add output.txt Co-authored-by: nuclearcat <1076310+nuclearcat@users.noreply.github.com> --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 60c3262ff..b943c1d98 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ data *.venv *.log test_output/ +output.txt From 5c13292f0fe619cf7a2331adc756cb96f866948b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 27 Apr 2026 19:34:32 +0000 Subject: [PATCH 3/3] tools/sync_stable_branches: handle initial X.0 releases without patch number Co-authored-by: nuclearcat <1076310+nuclearcat@users.noreply.github.com> --- tools/sync_stable_branches.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/sync_stable_branches.py b/tools/sync_stable_branches.py index 94cf8a317..3eca7001b 100755 --- a/tools/sync_stable_branches.py +++ b/tools/sync_stable_branches.py @@ -47,7 +47,8 @@ def get_active_branches(releases_data): continue version = release.get("version", "") - match = re.match(r"^(\d+)\.(\d+)\.", version) + # Match both initial releases (e.g. "7.0") and point releases (e.g. "7.0.1") + match = re.match(r"^(\d+)\.(\d+)", version) if match: major, minor = int(match.group(1)), int(match.group(2)) branches.add((major, minor))