Hi Bruce,
This is a trial merge of the stable kernel v6.1.98 v6.6.39 for the following
branches in the linux-yocto.
5ef56ebcd304 v6.1/standard/sdkv5.10/axxia
daa8e73c826f v6.1/standard/preempt-rt/sdkv5.10/axxia
b9d6d0cbf23e v6.1/standard/base
89fe8e824074 v6.1/standard/preempt-rt/base
f8b0042f3ee9 v6.1/standard/ti-sdk-6.1/ti-j7xxx
f40095c37b46 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
1a49992dea6b v6.1/standard/nxp-sdk-6.1/nxp-soc
31b4a835f822 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
bde3cfc9a79b v6.1/standard/cn-sdkv5.15/octeon
#Have textual conflicts
a062547bac23 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual conflicts
2d1522230901 v6.1/standard/cn-sdkv6.1/octeon
#Have textual conflicts
c3f0b155d5a4 v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
#Have textual conflicts
a8be6ddaed0e v6.1/standard/microchip-polarfire-soc
7e7fcd433652 v6.1/standard/preempt-rt/microchip-polarfire-soc
3e702cc792c6 v6.1/standard/bcm-2xxx-rpi
7cc602784c68 v6.1/standard/preempt-rt/bcm-2xxx-rpi
deb16a8207b7 v6.1/standard/nxp-sdk-5.15/nxp-s32g
2648c1b70dd0 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
fdd662dbf710 v6.1/standard/intel-sdk-6.1/intel-socfpga
d9ffb9d1c68f v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
7dc29bb2573f v6.1/standard/x86
3094e3ba5ad5 v6.1/standard/preempt-rt/x86
c83a21ac5848 v6.1/standard/sdkv6.1/xlnx-soc
b1f87060e50b v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
882b48dc0585 v6.6/standard/sdkv5.15/axxia
f738933ff7fe v6.6/standard/preempt-rt/sdkv5.15/axxia
32018fcf7211 v6.6/standard/base
74be4077d5d1 v6.6/standard/preempt-rt/base
fc54aaa18716 v6.6/standard/nxp-sdk-6.6/nxp-soc
4cc32077fe23 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
9f91569480cd v6.6/standard/cn-sdkv6.1/octeon
#Have textual conflicts
ab87a152fcf5 v6.6/standard/preempt-rt/cn-sdkv6.1/octeon
#Have textual conflicts
63005babf653 v6.6/standard/nxp-sdk-6.6/nxp-s32g
18c289f2effb v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
c69e8ee94c5d v6.6/standard/ti-sdk-6.6/ti-soc
45001364c2df v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc
27437ec6e297 v6.6/standard/sdkv6.6/xlnx-soc
0f36ddec4b31 v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc
There is only a minor conflict on the octeon branches. 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 (#14141):
https://lists.yoctoproject.org/g/linux-yocto/message/14141
Mute This Topic: https://lists.yoctoproject.org/mt/107162741/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
