Hi Bruce,
This is a trial merge of the stable kernel v6.12.59 v6.6.117 for the following
branches in the linux-yocto.
94580d51335a 20251125/v6.12/standard/base
abff820e2fa1 20251125/v6.12/standard/preempt-rt/base
03618ac1198f 20251125/v6.12/standard/nvidia-sdk-5.15/nvidia-soc
1ef40ffaeba2 20251125/v6.12/standard/preempt-rt/nvidia-sdk-5.15/nvidia-soc
a8cdf454458f 20251125/v6.12/standard/nxp-sdk-6.12/nxp-soc
6476577109c7 20251125/v6.12/standard/preempt-rt/nxp-sdk-6.12/nxp-soc
19cd6efd5021 20251125/v6.12/standard/octeon
66845b30904e 20251125/v6.12/standard/preempt-rt/octeon
6c18675c5eba 20251125/v6.12/standard/bcm-2xxx-rpi
843bb6da56a9 20251125/v6.12/standard/preempt-rt/bcm-2xxx-rpi
5ddc50ac66b6 20251125/v6.12/standard/nxp-sdk-6.6/nxp-s32g
7590d10d2f5f 20251125/v6.12/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
77c35bd8d1dd 20251125/v6.12/standard/intel-socfpga
5484fefa1394 20251125/v6.12/standard/preempt-rt/intel-socfpga
ee2f115850b9 20251125/v6.12/standard/ti-soc
2dd1c44c874c 20251125/v6.12/standard/preempt-rt/ti-soc
fadf47ebe721 20251125/v6.12/standard/x86
3f9dfddfab8b 20251125/v6.12/standard/preempt-rt/x86
4d8d33377752 20251125/v6.12/standard/xlnx-soc
4ffce090bc5c 20251125/v6.12/standard/preempt-rt/xlnx-soc
afffeb39e0ad 20251125/v6.6/standard/sdkv5.15/axxia
1046e7a92bc3 20251125/v6.6/standard/preempt-rt/sdkv5.15/axxia
aa72f193b1ed 20251125/v6.6/standard/base
c39d8d41da43 20251125/v6.6/standard/preempt-rt/base
a5b2c6ea0c7a 20251125/v6.6/standard/nxp-sdk-6.6/nxp-soc
#Have textual conflicts
f490b64a55a9 20251125/v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
#Have textual conflicts
087d331779d3 20251125/v6.6/standard/cn-sdkv6.1/octeon
ae4cbd4f8acc 20251125/v6.6/standard/preempt-rt/cn-sdkv6.1/octeon
6631913eb794 20251125/v6.6/standard/cn-sdkv6.6/octeon
f3e3c20849b5 20251125/v6.6/standard/preempt-rt/cn-sdkv6.6/octeon
9c598a475ed0 20251125/v6.6/standard/nvidia-orin
891358e3765a 20251125/v6.6/standard/preempt-rt/nvidia-orin
c4c8d4923c6b 20251125/v6.6/standard/microchip-polarfire-soc
ee0202ed8123 20251125/v6.6/standard/preempt-rt/microchip-polarfire-soc
b8451982f053 20251125/v6.6/standard/bcm-2xxx-rpi
#Have textual conflicts
14fcf0b25cc4 20251125/v6.6/standard/preempt-rt/bcm-2xxx-rpi
#Have textual conflicts
e27212deabf6 20251125/v6.6/standard/nxp-sdk-6.6/nxp-s32g
#Have textual conflicts
2c6e25b2cb5c 20251125/v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
#Have textual conflicts
602beb407104 20251125/v6.6/standard/intel-sdk-6.6/intel-socfpga
eb7272318d3f 20251125/v6.6/standard/preempt-rt/intel-sdk-6.6/intel-socfpga
216a4be62384 20251125/v6.6/standard/ti-sdk-6.6/ti-soc
#Have textual conflicts
f3743693cd7f 20251125/v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc
#Have textual conflicts
f58613d200af 20251125/v6.6/standard/x86
aebbb968b3ca 20251125/v6.6/standard/preempt-rt/x86
fa748e2017fd 20251125/v6.6/standard/sdkv6.6/xlnx-soc
1e7c55e54bb0 20251125/v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc
Several merge conflicts have been identified across multiple branches in the
v6.6 kernel. These conflicts mirror those previously encountered during the
v6.12.58 kernel merge and can be automatically resolved by reapplying the
recorded resolutions.
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 (#16001):
https://lists.yoctoproject.org/g/linux-yocto/message/16001
Mute This Topic: https://lists.yoctoproject.org/mt/116468206/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
