Skip to content

sync: 验证 OnePlus 13 通用兼容冲突解决第五轮 - #15

Open
Zhanfg wants to merge 5 commits into
6.6-finalfrom
sync/resolution-pass5-compat-16.0.9.401
Open

Zhanfg wants to merge 5 commits into
6.6-finalfrom
sync/resolution-pass5-compat-16.0.9.401

Conversation

@Zhanfg

@Zhanfg Zhanfg commented Jul 29, 2026

Copy link
Copy Markdown
Collaborator

第五轮范围

处理 10 个通用兼容路径:

  • 保留本地较新实现:.gitignore、MIPS TLB、perf user-task 判断、MPTCP fallback gate、CAKE backlog accounting。
  • 接受官方修复:Renesas CAN-FD mode helper、Renesas USB2 reset lifecycle、MPTCP simultaneous connect。
  • AMD microcode 逐块组合:保留本地 cutoff helper,接受官方 Family 1Ah model 范围修正。

预期结果

116 initial conflicts
85 after pass 1
67 after pass 2
50 after pass 3
33 after scheduler pass 4
23 after compatibility pass 5

排除范围

剩余 ABI/KMI、AFDO、F2FS/EXT4、内存 hooks、IOMMU、Mellanox firmware reset 和 Unix socket graph 仍需专项处理。

本 PR 只加入可重复解决规则和验证,不生成最终源码 merge commit。

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