Repository navigation
sync: 验证 OnePlus 13 16.0.9.401 冲突解决第一轮 - #11
Merged
Merged
Conversation
9 tasks
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
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.
第一轮范围
重要修正
此前 80 个冲突来自截断报告。真实 Git merge + unmerged index 的权威结果是 116 个路径。
新发现
官方
SCHED_CLASS_EXT/SCX与本地 HMBIRD 均占用调度策略编号 7,并改写同一批 scheduler 接口,当前不能直接共存。本 PR 不尝试机械解决调度架构冲突。安全边界
本 PR 只加入解决规则、验证脚本和文档,不生成或合并最终内核源码 merge commit。