Revert accidental merge of maintenance-10.x into maintenance-9.x#11606
Merged
sensei-hacker merged 4 commits intoMay 31, 2026
Merged
Conversation
…nance-10.x Removes the DroneCAN DSDLC library (lib/main/Dronecan -- entirely new in 10.x) and reverts STM32F4/F7/H7 HAL libraries to their maintenance-9.x versions. 932 files. No post-merge commits touched lib/ -- this is a clean mechanical revert.
Reverts 319 STM32CubeF7 SDK extraction files introduced by the accidental maintenance-10.x merge. No post-merge commits touched this directory -- this is a clean mechanical revert.
Contributor
Qodo reviews are paused for this user.Troubleshooting steps vary by plan Learn more → On a Teams plan? Using GitHub Enterprise Server, GitLab Self-Managed, or Bitbucket Data Center? |
|
Test firmware build ready — commit Download firmware for PR #11606 238 targets built. Find your board's
|
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
2 participants
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.
Summary
On 2026-05-24, commit
10343b4de1accidentally merged the entiremaintenance-10.xbranch intomaintenance-9.x, contaminating it with DroneCAN, CRSF sensor input, Output Assignment API v2, and 28,393 build/library artifacts that should not be present in 9.x.This PR reverts that contamination via 4 commits structured for clean review:
900a88b— cherry-pickbuild_hw/CMake artifacts + adds to.gitignore7a9b7bb— lib/ revert2db9595— stm32cubef7 revertd5ac9bb— code revertsrc/,cmake/,docs/— the actual firmware codeThe first three commits are mechanical reversions that require no line-by-line review. The fourth commit is the one that needs scrutiny.
What is preserved
All legitimate 9.x work added after the bad merge is fully preserved:
Verification
git diff bb61218284 HEAD -- src/main/flight/mixer.h→ no delta (clean base)git diff bb61218284 HEAD -- src/main/fc/fc_msp.c→ +3 lines (programmingPidInit()from PR Reset free PIDs if coefficients are changed via CLI or MSP #11431 only)build_hw/artifactsContext
A clean
release/9.1branch also exists (branched frombb61218284with all legitimate work cherry-picked).This PR cleans up
maintenance-9.xitself so contributors who branch from it are not working against contaminated code.