Hi Bruce,
This is a trial merge of the stable kernel v5.15.147 v6.1.73 for the following
branches in the linux-yocto.
9a246c2e36ad v5.15/standard/sdkv5.10/axxia
c2332b69f732 v5.15/standard/preempt-rt/sdkv5.10/axxia
2e914c1570ee v5.15/standard/base
ae36cbd24fb1 v5.15/standard/preempt-rt/base
a4cfcde3a893 v5.15/standard/cn-sdkv5.4/octeon
#Have textual conflicts
720e9fd2ec11 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
#Have textual conflicts
0449e981cd6f v5.15/standard/cn-sdkv5.15/octeon
#Have textual conflicts
2645fa34fa63 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual conflicts
de909f0d84d4 v5.15/standard/ti-sdk-5.10/ti-j72xx
a1e4c426e783 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
5823ad8da2e7 v5.15/standard/nxp-sdk-5.15/nxp-soc
466079d642d1 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
a5831da1a1ed v5.15/standard/bcm-2xxx-rpi
2111b37f040b v5.15/standard/preempt-rt/bcm-2xxx-rpi
3ec1272b6eaf v5.15/standard/nxp-sdk-5.15/nxp-s32g
0e489d0dcd94 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
37ec30be53ae v5.15/standard/intel-sdk-5.15/intel-socfpga
efff5185d724 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
3074949bd235 v5.15/standard/x86
a7acd94843eb v5.15/standard/preempt-rt/x86
8bedd5d2abfa v5.15/standard/sdkv5.15/xlnx-soc
d655616b570b v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
783cd1bfc30f v6.1/standard/sdkv5.10/axxia
2932a760cc54 v6.1/standard/preempt-rt/sdkv5.10/axxia
0c0af508fd92 v6.1/standard/base
2f575407bddc v6.1/standard/preempt-rt/base
bd0d86de7dbf v6.1/standard/ti-sdk-6.1/ti-j7xxx
4c978003d3a9 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
0f5b639c5073 v6.1/standard/nxp-sdk-6.1/nxp-soc
1778b6be7608 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
c647d3ec32ac v6.1/standard/cn-sdkv5.15/octeon
97f196bbad16 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
7ffade61386d v6.1/standard/microchip-polarfire-soc
0e097d64621b v6.1/standard/preempt-rt/microchip-polarfire-soc
812180e3a3bf v6.1/standard/bcm-2xxx-rpi
4e7691108339 v6.1/standard/preempt-rt/bcm-2xxx-rpi
f7ab5e54ab66 v6.1/standard/nxp-sdk-5.15/nxp-s32g
cc6220fedab2 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
ba4d7ab73168 v6.1/standard/intel-sdk-6.1/intel-socfpga
f1d9924365be v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
5fd07e7a199b v6.1/standard/x86
266bc43a4acc v6.1/standard/preempt-rt/x86
8dd296cd8060 v6.1/standard/sdkv6.1/xlnx-soc
d5de94a91512 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
For v5.15.147, it doesn't have many patches (only 60), but it has introduced
many significant conflicts in the octeon branches. We can resolve most of them
by favoring the SDK version. However, there are some that need to be handled
with extra care. There are only 5 patches in the v6.1.73, so there is no any
conflict when merging it. 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 (#13485):
https://lists.yoctoproject.org/g/linux-yocto/message/13485
Mute This Topic: https://lists.yoctoproject.org/mt/103758882/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
