Hi Bruce,
This is a trial merge of the stable kernel v5.15.144 v6.1.69 for the following
branches in the linux-yocto.
0d0adcd42087 v5.15/standard/sdkv5.10/axxia
f338beb8fece v5.15/standard/preempt-rt/sdkv5.10/axxia
0e48cf50d3aa v5.15/standard/base
1f253ec3cc59 v5.15/standard/preempt-rt/base
92d0ba4ca468 v5.15/standard/cn-sdkv5.4/octeon
#Have textual conflicts
20e9d5d61d8a v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
#Have textual conflicts
8c610e5e402d v5.15/standard/cn-sdkv5.15/octeon
d8b9aed9f228 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
546e80738a54 v5.15/standard/ti-sdk-5.10/ti-j72xx
6a0b5ff29cd6 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
8e55d8dbb8b5 v5.15/standard/nxp-sdk-5.15/nxp-soc
5659a3adf51f v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
867e6e16fd05 v5.15/standard/bcm-2xxx-rpi
e3f51ee15cbf v5.15/standard/preempt-rt/bcm-2xxx-rpi
0d3ac3fdd317 v5.15/standard/nxp-sdk-5.15/nxp-s32g
6aa798223ea7 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
130e3e864574 v5.15/standard/intel-sdk-5.15/intel-socfpga
8c5ed4d4f0c9 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
f51cf75dc264 v5.15/standard/x86
b9efe5a9bcb0 v5.15/standard/preempt-rt/x86
2c10df7ce373 v5.15/standard/sdkv5.15/xlnx-soc
d08ae8ebd8f8 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
4da3ae24fc04 v6.1/standard/sdkv5.10/axxia
#Have textual conflicts
074a77c06f85 v6.1/standard/preempt-rt/sdkv5.10/axxia
#Have textual conflicts
82156cba142c v6.1/standard/base
08cf920ea98a v6.1/standard/preempt-rt/base
1f9197920d75 v6.1/standard/ti-sdk-6.1/ti-j7xxx
c423801073d6 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
8f012d414a52 v6.1/standard/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
f375b32beccb v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
7f032cac63e7 v6.1/standard/cn-sdkv5.15/octeon
b6aba4872ba3 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
e5848355e88d v6.1/standard/microchip-polarfire-soc
6c806d8b518c v6.1/standard/preempt-rt/microchip-polarfire-soc
afedccf9b8f3 v6.1/standard/bcm-2xxx-rpi
d85c20250303 v6.1/standard/preempt-rt/bcm-2xxx-rpi
cddd49e642e2 v6.1/standard/nxp-sdk-5.15/nxp-s32g
17e7e33bd678 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
e66b84e5d2f4 v6.1/standard/intel-sdk-6.1/intel-socfpga
#Have textual conflicts
e646f401b468 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
#Have textual conflicts
08a830052d54 v6.1/standard/x86
efa05f8cbbad v6.1/standard/preempt-rt/x86
b00d2fa5675f v6.1/standard/sdkv6.1/xlnx-soc
35606997419a v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
In this stable kernel upgrade, there is only one merge conflicts on the v5.15
kernel. Most of the other conflicts come from the v6.1 kernel. They are not
trivial, but also not so particularly tricky to handle. All the branches have
passed my build test. I have pushed all these branches 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 (#13436):
https://lists.yoctoproject.org/g/linux-yocto/message/13436
Mute This Topic: https://lists.yoctoproject.org/mt/103298598/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
