【跟踪】6.12 系列合并 6.6 补丁情况一览 - Githubissues

deepin-community / kernel-rolling

Kernel source tree for rolling-stable and mainline releases

Other

2 stars 1 forks source link

【跟踪】6.12 系列合并 6.6 补丁情况一览 #11

Open MingcongBai opened 2 weeks ago

MingcongBai commented 2 weeks ago

本工单用于跟踪从 6.6 分支引入的厂商补丁的移植情况，本次移植后，补丁后续将以 cherry-pick 的形式变基到各 rolling-stable 最新分支

下方缩进项指代顶层依赖项

当前代码基础

6.12.1

外设支持类（显卡）

外设支持类（网卡）

[x] https://github.com/deepin-community/kernel/pull/190
[x] https://github.com/deepin-community/kernel/pull/328
- [x] 参考 https://github.com/loongarchlinux/linux/commit/6e0a2f25ee3aff7fcdf844031df3affaf4e194da 进行修复适配
[ ] https://github.com/deepin-community/kernel/pull/349
[ ] https://github.com/deepin-community/kernel/pull/357
[ ] https://github.com/deepin-community/kernel/pull/359
- [ ] https://github.com/deepin-community/kernel/pull/497
[ ] https://github.com/deepin-community/kernel/pull/361
[ ] https://github.com/deepin-community/kernel/pull/405
- [ ] https://github.com/deepin-community/kernel/pull/404
- [ ] https://github.com/deepin-community/kernel/pull/407
[ ] https://github.com/deepin-community/kernel/pull/406
[ ] https://github.com/deepin-community/kernel/pull/413
[x] ~~https://github.com/deepin-community/kernel/pull/461~~ （上游已于 6.12 合并）
[x] ~~https://github.com/deepin-community/kernel/pull/478~~ （上游已于 6.11-rc1 合并）
[x] ~~https://github.com/deepin-community/kernel/pull/479~~ （上游已于 6.11-rc1 合并）
[x] ~~https://github.com/deepin-community/kernel/pull/480~~ （与上游代码结构不同）
[x] ~~https://github.com/deepin-community/kernel/pull/483~~ （上游已于 6.12-rc4 合并）
[x] ~~https://github.com/deepin-community/kernel/pull/484~~ （无需合并）
[ ] https://github.com/deepin-community/kernel/pull/491
- 有待讨论：是否使用上游 v2 补丁？
- https://lore.kernel.org/lkml/20241120105625.22508-1-Frank.Sae@motor-comm.com/T/#m2d48e116fae3fb09ddd51e487fed82f1053efef5

外设支持类（输入）

[x] ~~https://github.com/deepin-community/kernel/pull/431~~ （上游已于 6.12 合并）

外设支持类（存储）

[ ] https://github.com/deepin-community/kernel/pull/433
- [ ] https://github.com/deepin-community/kernel/pull/487

平台支持类（飞腾）

[x] https://github.com/deepin-community/kernel/pull/107
[x] ~~https://github.com/deepin-community/kernel/pull/118~~
- [x] ~~https://github.com/deepin-community/kernel/pull/120~~
- [x] https://github.com/deepin-community/kernel/pull/316
- 使用 AOSC 移植的补丁集替换
  - 54585a645d94
  - 8373b274fbec
  - 1ab87d3dc0fe
  - 126d82a6233e
  - 098141e50da0
  - 59d3700acaa8
[x] https://github.com/deepin-community/kernel/pull/122
[x] https://github.com/deepin-community/kernel/pull/123
[x] https://github.com/deepin-community/kernel/pull/125
[x] ~~https://github.com/deepin-community/kernel/pull/128~~ （上游已于 6.12 合并 118ecef16cc2）
- [x] https://github.com/deepin-community/kernel/pull/151
[x] https://github.com/deepin-community/kernel/pull/134
[x] https://github.com/deepin-community/kernel/pull/138
[x] https://github.com/deepin-community/kernel/pull/142
[x] ~https://github.com/deepin-community/kernel/pull/144~
- [x] ~https://github.com/deepin-community/kernel/pull/240~
[x] https://github.com/deepin-community/kernel/pull/145
[x] https://github.com/deepin-community/kernel/pull/146
[x] https://github.com/deepin-community/kernel/pull/147
[ ] https://github.com/deepin-community/kernel/pull/148
- [ ] https://github.com/deepin-community/kernel-rolling/issues/5
[x] https://github.com/deepin-community/kernel/pull/149
[x] https://github.com/deepin-community/kernel/pull/150
[x] https://github.com/deepin-community/kernel/pull/152
[x] https://github.com/deepin-community/kernel/pull/153
[x] https://github.com/deepin-community/kernel/pull/154
[x] https://github.com/deepin-community/kernel/pull/155
[x] https://github.com/deepin-community/kernel/pull/158
[x] https://github.com/deepin-community/kernel/pull/159
[x] https://github.com/deepin-community/kernel/pull/160
[x] https://github.com/deepin-community/kernel/pull/161
[x] https://github.com/deepin-community/kernel/pull/167
[x] https://github.com/deepin-community/kernel/pull/186
[x] https://github.com/deepin-community/kernel/pull/188
[x] https://github.com/deepin-community/kernel/pull/189
[x] https://github.com/deepin-community/kernel/pull/191
[x] https://github.com/deepin-community/kernel/pull/193
[x] https://github.com/deepin-community/kernel/pull/199
[x] https://github.com/deepin-community/kernel/pull/200
[x] https://github.com/deepin-community/kernel/pull/201
[x] https://github.com/deepin-community/kernel/pull/202
[x] https://github.com/deepin-community/kernel/pull/212
[x] https://github.com/deepin-community/kernel/pull/222
- [x] #4
[x] https://github.com/deepin-community/kernel/pull/223
[x] https://github.com/deepin-community/kernel/pull/289
[x] https://github.com/deepin-community/kernel/pull/299
[ ] https://github.com/deepin-community/kernel/pull/300
[x] https://github.com/deepin-community/kernel/pull/302
[x] https://github.com/deepin-community/kernel/pull/312
[x] https://github.com/deepin-community/kernel/pull/374
[ ] https://github.com/deepin-community/kernel/pull/376
- [ ] https://github.com/deepin-community/kernel/pull/355
  - [ ] https://github.com/deepin-community/kernel/pull/136
    - [ ] #2
    - [ ] https://github.com/deepin-community/kernel/pull/218
    - [ ] https://github.com/deepin-community/kernel/pull/233
[x] https://github.com/deepin-community/kernel/pull/498

平台支持类（鲲鹏）

[x] https://github.com/deepin-community/kernel/pull/409

平台支持类（AArch64 通用）

[x] ~~https://github.com/deepin-community/kernel/pull/236~~ （上游已于 6.10 合并）
[x] https://github.com/deepin-community/kernel/pull/249
[x] https://github.com/deepin-community/kernel/pull/309
[x] https://github.com/deepin-community/kernel/pull/345

平台支持类（龙架构）

[x] ~~https://github.com/deepin-community/kernel/pull/130~~ 已由 AOSC 补丁集替代
[x] https://github.com/deepin-community/kernel/pull/143
[x] https://github.com/deepin-community/kernel/pull/192
[x] https://github.com/deepin-community/kernel/pull/220
[x] ~~https://github.com/deepin-community/kernel/pull/241~~
- [x] ddc76feeb199f5ee236abc4f8ceef2012d87e212 （上游已于 6.10 合并）
[x] ~~https://github.com/deepin-community/kernel/pull/269~~ （已由 AOSC 补丁集替代）
[x] ~~https://github.com/deepin-community/kernel/pull/287~~ （取用上游 v13）
[x] ~~https://github.com/deepin-community/kernel/pull/290~~ （上游已于 6.7 合并）
[x] https://github.com/deepin-community/kernel/pull/293
[x] ~~https://github.com/deepin-community/kernel/pull/307~~ （上游已于 6.9 合并）
[x] https://github.com/deepin-community/kernel/pull/323
[x] https://github.com/deepin-community/kernel/pull/326
[x] https://github.com/deepin-community/kernel/pull/337
[x] ~~https://github.com/deepin-community/kernel/pull/338~~ （已由 AOSC 补丁集替代）
[x] https://github.com/deepin-community/kernel/pull/339
[x] https://github.com/deepin-community/kernel/pull/340
[x] ~~https://github.com/deepin-community/kernel/pull/422~~ （上游已于 6.11 合并）
[x] https://github.com/deepin-community/kernel/pull/446

平台支持类（海光）

平台支持类（兆芯）

[x] https://github.com/deepin-community/kernel/pull/254
[x] https://github.com/deepin-community/kernel/pull/255
[x] https://github.com/deepin-community/kernel/pull/256
[x] https://github.com/deepin-community/kernel/pull/257
[x] https://github.com/deepin-community/kernel/pull/258
[x] https://github.com/deepin-community/kernel/pull/259
[x] https://github.com/deepin-community/kernel/pull/261
[x] https://github.com/deepin-community/kernel/pull/262
[x] https://github.com/deepin-community/kernel/pull/263
[x] https://github.com/deepin-community/kernel/pull/264
[x] https://github.com/deepin-community/kernel/pull/265
[x] https://github.com/deepin-community/kernel/pull/267
[x] https://github.com/deepin-community/kernel/pull/272
- [x] https://github.com/deepin-community/kernel/pull/253
- [ ] 扩展拓扑探测补丁 (https://github.com/deepin-community/kernel/pull/253/commits/28abea973674022fd34cfe7f6d998b4509544c42) 无法构建，因为相关代码已在 6.7 被移除，而 Intel/AMD 均已使用通用方法实现此探测功能
[x] https://github.com/deepin-community/kernel/pull/275
[x] https://github.com/deepin-community/kernel/pull/276
[ ] https://github.com/deepin-community/kernel/pull/277
[x] https://github.com/deepin-community/kernel/pull/278
[x] https://github.com/deepin-community/kernel/pull/280
[x] https://github.com/deepin-community/kernel/pull/281
[x] https://github.com/deepin-community/kernel/pull/286
[x] https://github.com/deepin-community/kernel/pull/325
[x] https://github.com/deepin-community/kernel/pull/329
[x] https://github.com/deepin-community/kernel/pull/330
[x] https://github.com/deepin-community/kernel/pull/331
[x] https://github.com/deepin-community/kernel/pull/334
[x] https://github.com/deepin-community/kernel/pull/336
[x] https://github.com/deepin-community/kernel/pull/367
- [x] https://github.com/deepin-community/kernel/pull/282
[x] https://github.com/deepin-community/kernel/pull/368
[x] https://github.com/deepin-community/kernel/pull/371
[x] ~~https://github.com/deepin-community/kernel/pull/387~~ （上游已于 6.10 合并，驱动名为 i2c-via-zhaoxin）
- [x] ~~https://github.com/deepin-community/kernel/pull/268~~
[x] https://github.com/deepin-community/kernel/pull/391
[x] https://github.com/deepin-community/kernel/pull/392
[x] https://github.com/deepin-community/kernel/pull/394
- 该补丁被 6.6 维护树于 6.6.49 后撤回：24ec0faaa352；但实际上 >= 6.10 需要该补丁，详见：https://github.com/torvalds/linux/commit/8a2f11878771da65b8ac135c73b47dae13afbd62

平台支持类（Intel）

[x] https://github.com/deepin-community/kernel/pull/297
- [x] https://github.com/deepin-community/kernel/pull/79
[x] ~~https://github.com/deepin-community/kernel/pull/423~~ （上游已于 6.12 合并）

平台支持类（其他 x86 厂商）

[x] https://github.com/deepin-community/kernel/pull/239

平台支持类（x86 通用）

[x] ~https://github.com/deepin-community/kernel/pull/279~ （上游已于 6.8 合并）
[x] ~https://github.com/deepin-community/kernel/pull/283~ （上游已于 6.8 合并）
[x] https://github.com/deepin-community/kernel/pull/305
[x] https://github.com/deepin-community/kernel/pull/314
[x] https://github.com/deepin-community/kernel/pull/360
[x] https://github.com/deepin-community/kernel/pull/369
[x] https://github.com/deepin-community/kernel/pull/370
[ ] https://github.com/deepin-community/kernel/pull/412
- [ ] https://github.com/deepin-community/kernel/pull/420
[x] ~~https://github.com/deepin-community/kernel/pull/450~~ （上游已于 6.12 合并）
[x] https://github.com/deepin-community/kernel/pull/454
[x] https://github.com/deepin-community/kernel/pull/462

平台支持类（RISC-V 通用）

[x] ~~https://github.com/deepin-community/kernel/pull/398~~ （上游已于 6.9 合并）
[x] ~~https://github.com/deepin-community/kernel/pull/400~~ （上游已于 6.10 合并，补丁内容有差异，待测）
[x] ~~https://github.com/deepin-community/kernel/pull/416~~ （上游已于 6.10 合并：e0503d47e93d）
[x] https://github.com/deepin-community/kernel/pull/418

平台支持类（申威）

[x] ~~https://github.com/deepin-community/kernel/pull/439~~ （不在支持范围内）

平台支持类（MIPS）

[x] https://github.com/deepin-community/kernel/pull/452

平台支持类（通用）

[x] https://github.com/deepin-community/kernel/pull/396
[x] ~~https://github.com/deepin-community/kernel/pull/476~~ （上游已于 6.12-rc1 合并）
[x] https://github.com/deepin-community/kernel/pull/477

发布管理类

[x] https://github.com/deepin-community/kernel/pull/232
[x] https://github.com/deepin-community/kernel/pull/234
[x] https://github.com/deepin-community/kernel/pull/291
[x] https://github.com/deepin-community/kernel/pull/292
[x] https://github.com/deepin-community/kernel/pull/335
[x] https://github.com/deepin-community/kernel/pull/358
[x] https://github.com/deepin-community/kernel/pull/381
[x] ~~https://github.com/deepin-community/kernel/pull/388~~ （主线不跟踪 kABI）
[x] ~~https://github.com/deepin-community/kernel/pull/389~~ （主线不跟踪 kABI）
[x] https://github.com/deepin-community/kernel/pull/414
[x] ~~https://github.com/deepin-community/kernel/pull/419~~ （未引入 GitLab 备份）
[x] https://github.com/deepin-community/kernel/pull/437
[x] ~~https://github.com/deepin-community/kernel/pull/438~~ （主线不跟踪 kABI）
[x] https://github.com/deepin-community/kernel/pull/481
[x] https://github.com/deepin-community/kernel/pull/485
[ ] https://github.com/deepin-community/kernel/pull/493

opsiff commented 1 week ago

https://github.com/deepin-community/kernel/pull/461 已合入6.12版本不需要了

Avenger-285714 commented 3 days ago

https://github.com/deepin-community/kernel/pull/348 has merged upstream. And linux-stable has picked it to 4.19/5.4/5.10/5.15/6.1/6.6 :-)