Hi Bruce,
This is a trial merge of the stable kernel v6.12.68 v6.6.122 for the following
branches in the linux-yocto.
190eb64d86ca 20260131/v6.12/standard/base
c3c441281044 20260131/v6.12/standard/preempt-rt/base
9c45b244b431 20260131/v6.12/standard/nvidia-sdk-5.15/nvidia-soc
9b5ddea737cf 20260131/v6.12/standard/preempt-rt/nvidia-sdk-5.15/nvidia-soc
8188010eafaa 20260131/v6.12/standard/nxp-sdk-6.12/nxp-soc
00d3fd858a6d 20260131/v6.12/standard/preempt-rt/nxp-sdk-6.12/nxp-soc
57f357a674df 20260131/v6.12/standard/octeon
#Have textual conflicts
aaa99a0bd933 20260131/v6.12/standard/preempt-rt/octeon
#Have textual conflicts
a6c0a288f492 20260131/v6.12/standard/bcm-2xxx-rpi
5c2ccb4d1b06 20260131/v6.12/standard/preempt-rt/bcm-2xxx-rpi
db0f4b65b2b6 20260131/v6.12/standard/nxp-sdk-6.6/nxp-s32g
7d3610dbe767 20260131/v6.12/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
70919ccd4b83 20260131/v6.12/standard/intel-socfpga
f5b015339b8f 20260131/v6.12/standard/preempt-rt/intel-socfpga
af999483a128 20260131/v6.12/standard/ti-soc
#Have textual conflicts
f9456bb870d0 20260131/v6.12/standard/preempt-rt/ti-soc
#Have textual conflicts
f7c750391a31 20260131/v6.12/standard/x86
1025804dc7ca 20260131/v6.12/standard/preempt-rt/x86
43fcc63e3a12 20260131/v6.12/standard/xlnx-soc
5d25f1898eb5 20260131/v6.12/standard/preempt-rt/xlnx-soc
69cc3a58cb5c 20260131/v6.6/standard/sdkv5.15/axxia
55e92a99776c 20260131/v6.6/standard/preempt-rt/sdkv5.15/axxia
1d697dec51fe 20260131/v6.6/standard/base
3a6c2f3a6e73 20260131/v6.6/standard/preempt-rt/base
0e8c2d2dd04e 20260131/v6.6/standard/nxp-sdk-6.6/nxp-soc
981fe7779109 20260131/v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
39490f1cf44b 20260131/v6.6/standard/cn-sdkv6.1/octeon
#Have textual conflicts
35784c759cf2 20260131/v6.6/standard/preempt-rt/cn-sdkv6.1/octeon
#Have textual conflicts
3a28decd18a3 20260131/v6.6/standard/cn-sdkv6.6/octeon
#Have textual conflicts
0806799df2a1 20260131/v6.6/standard/preempt-rt/cn-sdkv6.6/octeon
#Have textual conflicts
fb71d40b5e3b 20260131/v6.6/standard/nvidia-orin
04a0dead83fb 20260131/v6.6/standard/preempt-rt/nvidia-orin
6e5b320a4379 20260131/v6.6/standard/microchip-polarfire-soc
523b77b24159 20260131/v6.6/standard/preempt-rt/microchip-polarfire-soc
9e4bf27d2570 20260131/v6.6/standard/bcm-2xxx-rpi
f0499ff4b514 20260131/v6.6/standard/preempt-rt/bcm-2xxx-rpi
ebe5bed382c1 20260131/v6.6/standard/nxp-sdk-6.6/nxp-s32g
d516ca6a4a59 20260131/v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
a307ca528678 20260131/v6.6/standard/intel-sdk-6.6/intel-socfpga
ebc0348e248e 20260131/v6.6/standard/preempt-rt/intel-sdk-6.6/intel-socfpga
aed04c95c6fd 20260131/v6.6/standard/ti-sdk-6.6/ti-soc
aa952bb140c2 20260131/v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc
ee042614e9f9 20260131/v6.6/standard/x86
44969870f98f 20260131/v6.6/standard/preempt-rt/x86
ac5cf8bcbee9 20260131/v6.6/standard/sdkv6.6/xlnx-soc
3c543d0848c5 20260131/v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc
The merge conflicts are primarily located in the octeon and ti branches.
When resolving them, please pay special attention to the following:
- For v6.12, v6.6 octeon branches:
When addressing the merge conflicts introduced by stable commit 1baa43ebca62
("octeontx2-af: Fix error handling"), it is also necessary to update the
goto label in the SDK changes to align with the modifications made to the
error handling path.
- For v6.12 ti branches:
The modification introduced by stable commit 4d733efd584b ("dmaengine: ti:
k3-udma:
Enable second resource range for BCDMA and PKTDMA") has already been
integrated via
the SDK commit 00bddc92771b ("FROMLIST: dmaengine: ti: k3-udma: Enable second
resource range for BCDMA and PKTDMA"). Therefore, to resolve merge conflicts,
we only need to retain the current code.
All branches have passed my build tests, and I have pushed them to:
https://github.com/haokexin/linux
You can use this as a reference for the linux-yocto stable kernel bump.
Thanks,
Kevin
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#16253):
https://lists.yoctoproject.org/g/linux-yocto/message/16253
Mute This Topic: https://lists.yoctoproject.org/mt/117560536/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
