chore(merge): main into feature/kernel-initrd-plugin
Metadata
Current evaluation
Merged as bb354f749, syncing main into feature/kernel-initrd-plugin to simplify review. The kernel/initrd feature changes later landed through #6116 and #6284.
Resolution: closed resolved
Reason: PR #6110 was merged at commit bb354f749 as an intentional branch synchronization. PR #6116 then delivered the feature changes, and #6284 merged the feature branch into main at ceace05f3.
Evaluated by: mr-cal-bot
No scores available.
Issue body
Purely merging whatever is on `HEAD` into feature/kernel-initrd-plugin for ease of reviewing (forthcoming) PR.
Marginally supercedes #6102.
---
- [x] I've followed the [contribution guidelines](https://github.com/canonical/snapcraft/blob/main/CONTRIBUTING.md).
- [x] I've signed the [CLA](http://www.ubuntu.com/legal/contributors/).
- [x] I've successfully run `make lint && make test`.
- [x] I've added or updated any relevant documentation.
- [x] I've updated the relevant release notes.
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed resolved | Merged as bb354f749, syncing main into feature/kernel-initrd-plugin to simplify review. The kernel/initrd feature changes later landed through #6116 and #6284. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged in canonical/snapcraft#6110 (bb354f749), updating the feature branch with main to simplify review; superseded #6102. | |
| qwen/qwen3.6-35b-a3b | — | — | Merged main into feature/kernel-initrd-plugin to streamline upcoming reviews. Approved by two reviewers and passed CI. Marginally supersedes PR #6102. Branch target was corrected during review. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged main into feature/kernel-initrd-plugin to streamline upcoming reviews, marginally superseding #6102. A target branch misconfiguration was noted but did not block the merge. |
Update history
No update history recorded yet.
Related work
-
Related To:
snapcraft#6102
(confidence 99%)
The PR body says it marginally supersedes #6102.
-
Related To:
snapcraft#6116
(confidence 99%)
Merged the kernel and initrd plugin feature work as 7c9706674.
-
Related To:
snapcraft#6284
(confidence 99%)
Merged the completed feature branch into main as ceace05f3.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #6255 Feature/kernel initrd plugin merge | snapcraft | merged | Merged as commit 6598b614e: a main-into-feature-branch sync for the kernel/initrd plugin branch (after conflict cleanup), picking up #6254 (518476fc1). The branch later landed on main via #6284 (ceace05f3). | |
| #6040 chore(merge): hotfix/8.14 into feature/kernel-initrd-plugin | snapcraft | merged | Merged hotfix/8.14 into feature/kernel-initrd-plugin (commit d82cc2b8e, PR #6040) to pick up 8.14 fixes without pulling unreleased Snapcraft 9 changes from main. Feature later landed in main via #6284. | |
| #503 chore(merge): merge 'main' back into 'feature/12f' | rockcraft | merged | Merged PR #503 after approval, synchronizing main into feature/12f with 183 additions and 21 deletions across 20 files. | |
| #1159 chore(merge): main into feature/pro-sources | rockcraft | merged | Merged main into feature/pro-sources; follow-up #1184 then squash-merged the feature into main as 1987d98b, completing the integration. | |
| #913 chore(merge): main into feature/pro-sources | craft-providers | merged | Merged main into the long-lived feature/pro-sources branch (commit f7edf3d) after a complex conflict caused by squashed PR #721; lint/test CI failures were accepted and deferred. The branch later landed in main via #918 (b56ff14). | |
| #614 chore: merge branch 'main' into 'feature/2.0' | craft-providers | merged | Merged main into feature/2.0 as a branch-sync update in commit 87435d0 after maintainer approval. | |
| #4581 chore(merge): 'main' into 'feature/components' | snapcraft | merged | Merged PR #4581 brought main into feature/components, updating the components snap with core24 support in revision 10646 and fixing #4576. | |
| #468 chore: merge main into feature/12f | rockcraft | merged | Merged PR #468 synchronized feature/12f with main; the author confirmed the branch update on 2024-02-12. | |
| #5569 chore(merge): feature/dotnet into main | snapcraft | merged | Merged feature/dotnet into main in commit 6f88f58db (#5569) after approval and required CI checks passed; prerequisite #5570 had merged. | |
| #1475 chore(merge): main into feature/pro-sources | craft-parts | merged | Merged main into feature/pro-sources to synchronize the branch; expected CI failures were deferred, while the pro-sources feature later landed in #1483 (bedb4c0f). |