Hi Bruce,
This is a trial merge of the stable kernel v5.15.139 v5.15.140 v5.15.141
v6.1.63 v6.1.64 v6.1.65 for the following branches in the linux-yocto.
0352666c1d49 v5.15/standard/sdkv5.10/axxia
ef6b4a29d7c3 v5.15/standard/preempt-rt/sdkv5.10/axxia
17a4f2b6112d v5.15/standard/base
e3b78ce10900 v5.15/standard/preempt-rt/base
721598769f6c v5.15/standard/cn-sdkv5.4/octeon
#Have textual conflicts
acef382e68b4 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
#Have textual conflicts
ceea32b1bac3 v5.15/standard/cn-sdkv5.15/octeon
#Have textual conflicts
2740c9c2cd17 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual conflicts
72b1a3810300 v5.15/standard/ti-sdk-5.10/ti-j72xx
#Have textual conflicts
9808d3be535f v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
#Have textual conflicts
5b2cd316e5d7 v5.15/standard/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
32456cf4f4d4 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
3c67b1e649e6 v5.15/standard/bcm-2xxx-rpi
2b96a4a670ad v5.15/standard/preempt-rt/bcm-2xxx-rpi
d234859b0c4c v5.15/standard/nxp-sdk-5.15/nxp-s32g
8bb3e145661f v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
5e18be40f33b v5.15/standard/intel-sdk-5.15/intel-socfpga
9a71b246d92a v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
8ddafcb21f53 v5.15/standard/x86
e5b2e6e4149d v5.15/standard/preempt-rt/x86
cb5476610eac v5.15/standard/sdkv5.15/xlnx-soc
#Have textual conflicts
dbafaeed50a0 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
#Have textual conflicts
df7d92109d0b v6.1/standard/sdkv5.10/axxia
1684e38b4edf v6.1/standard/preempt-rt/sdkv5.10/axxia
6409c1fca71b v6.1/standard/base
f3024223c728 v6.1/standard/preempt-rt/base
f33ec558ba26 v6.1/standard/ti-sdk-6.1/ti-j7xxx
#Have textual conflicts
4f19d0d5b031 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
#Have textual conflicts
39db2ae93c0f v6.1/standard/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
aafd1a13e8a8 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
4123aa109af2 v6.1/standard/cn-sdkv5.15/octeon
#Have textual and semantic conflicts
e3eca79b2af1 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual and semantic conflicts
57d7e3aba9f4 v6.1/standard/microchip-polarfire-soc
237e9607299c v6.1/standard/preempt-rt/microchip-polarfire-soc
0addbc847781 v6.1/standard/bcm-2xxx-rpi
#Have textual conflicts
17de1019def8 v6.1/standard/preempt-rt/bcm-2xxx-rpi
#Have textual conflicts
b3de578ed156 v6.1/standard/nxp-sdk-5.15/nxp-s32g
9eb121a7db94 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
a9544f7a93a0 v6.1/standard/intel-sdk-6.1/intel-socfpga
2cf0fbfdd69a v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
2abf396e5074 v6.1/standard/x86
42ed29e3d167 v6.1/standard/preempt-rt/x86
85fddbed50e6 v6.1/standard/sdkv6.1/xlnx-soc
#Have textual conflicts
b20da95bb266 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
#Have textual conflicts
There are many nasty merge conflicts when merging v6.1.63 on the octeon
branches.
I hope I have resolved them all correctly. There are also some merge conflicts
for
other stable releases, but they are not particular difficult 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 (#13348):
https://lists.yoctoproject.org/g/linux-yocto/message/13348
Mute This Topic: https://lists.yoctoproject.org/mt/102948914/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
