Skip to content

docs: 固化 OnePlus 13 16.0.9.401 同步冲突与基线 - #7

Merged
Zhanfg merged 3 commits into
6.6-finalfrom
docs/upstream-conflicts-16.0.9.401
Jul 29, 2026
Merged

Zhanfg merged 3 commits into
6.6-finalfrom
docs/upstream-conflicts-16.0.9.401

Conversation

@Zhanfg

@Zhanfg Zhanfg commented Jul 29, 2026

Copy link
Copy Markdown
Collaborator

本次更新

  • 明确本地 6.6-final 为 Linux 6.6.126,官方 16.0.9.401 common 为 Linux 6.6.118。
  • 记录共同祖先、本地领先 8,947 / 落后 5 个官方提交的关系。
  • 新增 docs/UPSTREAM_SYNC_16.0.9.401.md,列出全部 80 个冲突路径。
  • 按 ABI/KMI、配置、调度/内存、文件系统、驱动等分组定义处理顺序。
  • 更新 README 与 UPSTREAM 策略,关联 Draft 同步 PR chore: 同步 OnePlus 13 官方 common 16.0.9.401(剩余 50 个冲突) #6。
  • 明确禁止整树覆盖、ours/theirs 批量解决和未完成完整 OKI 验证直接合并。

仅更新文档,不修改内核源码。

@Zhanfg
Zhanfg merged commit 0c1c994 into 6.6-final Jul 29, 2026
1 check failed
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.

1 participant