Skip to content

sync: 验证 OnePlus 13 16.0.9.401 冲突解决第三轮 - #13

Merged
Zhanfg merged 4 commits into
6.6-finalfrom
sync/resolution-pass3-16.0.9.401
Jul 29, 2026
Merged

Zhanfg merged 4 commits into
6.6-finalfrom
sync/resolution-pass3-16.0.9.401

Conversation

@Zhanfg

@Zhanfg Zhanfg commented Jul 29, 2026

Copy link
Copy Markdown
Collaborator

第三轮范围

在已验证 Pass 1/2 基础上新增 17 个路径:

  • 保留本地较新或项目特定实现:ARM64 BPF、KASLR、蓝牙/HDA 设备兼容、cpuidle、Realtek SDIO、Tegra SPI、TCPM、NTFS3、ESP、Open vSwitch、IFE。
  • 采用官方修复:SVM LBR VMCB、AMD display fsleep()、mlx5 速率单位校验、KSMBD session user 释放。

预期结果

116 initial conflicts
85 after pass 1
67 after pass 2
50 after pass 3

排除范围

调度架构、ABI/KMI、AFDO、F2FS 核心、IOMMU、Mellanox firmware reset、Unix socket graph 和 Renesas reset 生命周期仍保留人工处理。

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

@Zhanfg
Zhanfg merged commit 286fb98 into 6.6-final Jul 29, 2026
1 check passed
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