Hi Bruce,
This is a trial merge of the stable kernel v5.15.108 v6.1.25 for the following
branches in the linux-yocto.
c46db5959381 v5.15/standard/sdkv5.10/axxia
503f06417b29 v5.15/standard/preempt-rt/sdkv5.10/axxia
193ce23a90ee v5.15/standard/base
b11485187754 v5.15/standard/cn-sdkv5.4/octeon
60fe2f8abb2a v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
0989d2e2ebe8 v5.15/standard/ti-sdk-5.10/ti-j72xx
72c2bbec3079 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
21468f36c82b v5.15/standard/nxp-sdk-5.15/nxp-soc
#Have conflicts
047e511a80d9 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
#Have conflicts
61c86d2c518a v5.15/standard/bcm-2xxx-rpi
30d2fc83ba58 v5.15/standard/preempt-rt/bcm-2xxx-rpi
64f4956c2b1d v5.15/standard/nxp-sdk-5.15/nxp-s32g
0b273787392c v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
995864443cca v5.15/standard/intel-sdk-5.15/intel-socfpga
4ddc5ce17f5a v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
8db1b0031b32 v5.15/standard/x86
26fb6b51e59a v5.15/standard/preempt-rt/x86
2fa224bb8417 v5.15/standard/sdkv5.15/xlnx-soc
722dae937194 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
44d21e579533 v6.1/standard/base
026270bf8e4f v6.1/standard/nxp-sdk-6.1/nxp-soc
#Have conflicts
1a6f6f65f887 v6.1/standard/bcm-2xxx-rpi
99e55720e290 v6.1/standard/preempt-rt/bcm-2xxx-rpi
There is a merge conflict on the nxp-soc branches(both v5.15 and v6.1), but it
is pretty simple
and straightforward to fix. There is also a build failure on the
v6.1/standard/nxp-sdk-6.1/nxp-soc
branch, it is unrelated to this stable merge. I have sent a fix for review [1].
I have done some
build test for these branches and all seem fine. 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.
[1] https://lists.yoctoproject.org/g/linux-yocto/message/12406
Thanks,
Kevin
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12407):
https://lists.yoctoproject.org/g/linux-yocto/message/12407
Mute This Topic: https://lists.yoctoproject.org/mt/98402845/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
