Hi Bruce,
This is a trial merge of the stable kernel v5.15.109 v6.1.26 for the following
branches in the linux-yocto.
72402fae873d v5.15/standard/sdkv5.10/axxia
d52d67d2b19b v5.15/standard/preempt-rt/sdkv5.10/axxia
#Have build failures
93226d45ff89 v5.15/standard/base
00117525c08a v5.15/standard/preempt-rt/base
#Have build failures
006cb070ebda v5.15/standard/cn-sdkv5.4/octeon
a7384996221a v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
#Have build failures
95b0e7100603 v5.15/standard/cn-sdkv5.15/octeon
d7706c14b7ad v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
#Have build failures
d4468624fb05 v5.15/standard/ti-sdk-5.10/ti-j72xx
856d37401e92 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
#Have build failures
d1becf2c8e35 v5.15/standard/nxp-sdk-5.15/nxp-soc
#Have conflicts
bd326a0924a1 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
#Have conflicts and build failures
ad969d69aafe v5.15/standard/bcm-2xxx-rpi
e3fa08777465 v5.15/standard/preempt-rt/bcm-2xxx-rpi
#Have build failures
15e9473f5dcc v5.15/standard/nxp-sdk-5.15/nxp-s32g
dbd21cd5188f v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
#Have build failures
d5de8de0c90a v5.15/standard/intel-sdk-5.15/intel-socfpga
3cc2547030e8 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
#Have build failures
173d59a1b670 v5.15/standard/x86
d9e7f58a28de v5.15/standard/preempt-rt/x86
#Have build failures
be50887cbac2 v5.15/standard/sdkv5.15/xlnx-soc
7c5f7dd72a15 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
#Have build failures
87689ef324fe v6.1/standard/base
a4a22bc4f759 v6.1/standard/preempt-rt/base
3a353f8138fe v6.1/standard/nxp-sdk-6.1/nxp-soc
#Have conflicts
11eec2b414ed v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
#Have conflicts
fac6ae407093 v6.1/standard/bcm-2xxx-rpi
5ae3d763f95f v6.1/standard/preempt-rt/bcm-2xxx-rpi
87689ef324fe v6.1/standard/x86
f52a7ecf7dd9 v6.1/standard/preempt-rt/x86
There is a merge conflict for dts file on nxp-soc branches (both v5.15 and
v6.1) and it is pretty
simple and straightforward to fix. There is also a build failure for the v5.15
rt kernel after
the stable merge. I have staged a fix on v5.15/standard/preempt-rt/base branch
and also merge it
into all the v5.15 rt branches. 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.
Thanks,
Kevin
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12429):
https://lists.yoctoproject.org/g/linux-yocto/message/12429
Mute This Topic: https://lists.yoctoproject.org/mt/98532204/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
