Hi Bruce,
This is a trial merge of the stable kernel v5.15.130 v5.15.131 v5.15.132
v6.1.54 for the following branches in the linux-yocto.
e12356457dd7 v5.15/standard/sdkv5.10/axxia
6a2506653e2c v5.15/standard/preempt-rt/sdkv5.10/axxia
0dc59b869aa0 v5.15/standard/base
2432045a4ca7 v5.15/standard/preempt-rt/base
09ed43fd25e0 v5.15/standard/cn-sdkv5.4/octeon
#Have textual conflicts
cc78db760516 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
#Have textual conflicts
d0c66bbdf5b3 v5.15/standard/cn-sdkv5.15/octeon
a33681eba933 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
d8234579483d v5.15/standard/ti-sdk-5.10/ti-j72xx
#Have textual conflicts
6e568bf44f0b v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
#Have textual conflicts
29ca1630eada v5.15/standard/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
a684eb1514af v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
00131c0ab285 v5.15/standard/bcm-2xxx-rpi
#Have textual conflicts
22a6ebf3efae v5.15/standard/preempt-rt/bcm-2xxx-rpi
056efe2536af v5.15/standard/nxp-sdk-5.15/nxp-s32g
54365ba9d6eb v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
9ee9db553222 v5.15/standard/intel-sdk-5.15/intel-socfpga
3ce305036b3b v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
2fea7a575b05 v5.15/standard/x86
d545593599f8 v5.15/standard/preempt-rt/x86
4c1a1d762497 v5.15/standard/sdkv5.15/xlnx-soc
#Have textual conflicts
8bdb0213153f v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
#Have textual conflicts
840c07d63d44 v6.1/standard/base
a90df542ecd0 v6.1/standard/preempt-rt/base
3ce744c5066f v6.1/standard/ti-sdk-6.1/ti-j7xxx
f5d759a5e20d v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
7f7c68fd8af3 v6.1/standard/nxp-sdk-6.1/nxp-soc
1cf95599c988 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
f31cd22e8c64 v6.1/standard/cn-sdkv5.15/octeon
6e4bfcbaab8f v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
2dc4be39321c v6.1/standard/bcm-2xxx-rpi
cfc7ad2235ae v6.1/standard/preempt-rt/bcm-2xxx-rpi
8cb512675495 v6.1/standard/nxp-sdk-5.15/nxp-s32g
3120bd9de022 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
ac7168dc34a4 v6.1/standard/intel-sdk-6.1/intel-socfpga
4010e9313397 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
086c02908310 v6.1/standard/x86
d8075c8a4271 v6.1/standard/preempt-rt/x86
03f153c7f0ee v6.1/standard/sdkv6.1/xlnx-soc
#Have textual conflicts
ee683707f991 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
#Have textual conflicts
This stable upgrade has some merge conflicts, but they are not too difficult to
resolve. 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 (#13086):
https://lists.yoctoproject.org/g/linux-yocto/message/13086
Mute This Topic: https://lists.yoctoproject.org/mt/101470540/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
