Hi Bruce,
This is a trial merge of the stable kernel v5.15.143 v6.1.68 for the following
branches in the linux-yocto.
2f940fa920cc v5.15/standard/sdkv5.10/axxia
d2a0f18129b5 v5.15/standard/preempt-rt/sdkv5.10/axxia
566595b1d042 v5.15/standard/base
662b30a31bbd v5.15/standard/preempt-rt/base
7b70883bc463 v5.15/standard/cn-sdkv5.4/octeon
06ce7f16feba v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
8c240f8b3bb1 v5.15/standard/cn-sdkv5.15/octeon
afdf03c05e4b v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
a87d9ce5c45f v5.15/standard/ti-sdk-5.10/ti-j72xx
e7a81b98963e v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
3ba5276874e9 v5.15/standard/nxp-sdk-5.15/nxp-soc
#Have textual and semantic conflicts
cb5d47ea3784 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
#Have textual and semantic conflicts
50a08e790913 v5.15/standard/bcm-2xxx-rpi
abe03a9168c4 v5.15/standard/preempt-rt/bcm-2xxx-rpi
d73b7646344e v5.15/standard/nxp-sdk-5.15/nxp-s32g
ce59ef8aaf79 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
63844ae619df v5.15/standard/intel-sdk-5.15/intel-socfpga
bb2364f7e9ce v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
abb0b0c4da04 v5.15/standard/x86
be77e6e5ccea v5.15/standard/preempt-rt/x86
c5006450c069 v5.15/standard/sdkv5.15/xlnx-soc
0701bc081ded v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
c3f3f4d6882b v6.1/standard/sdkv5.10/axxia
763340c7ce17 v6.1/standard/preempt-rt/sdkv5.10/axxia
f7aa74482d8d v6.1/standard/base
65a6f5c89ac8 v6.1/standard/preempt-rt/base
3c226ab50794 v6.1/standard/ti-sdk-6.1/ti-j7xxx
c6838e21a7ee v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
c0012a931c4b v6.1/standard/nxp-sdk-6.1/nxp-soc
#Have textual and semantic conflicts
f1e3511a3548 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
#Have textual and semantic conflicts
089ac90996ca v6.1/standard/cn-sdkv5.15/octeon
#Have textual conflicts
29e376e281eb v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual conflicts
8470b67e8e30 v6.1/standard/microchip-polarfire-soc
ab6a89da44bd v6.1/standard/preempt-rt/microchip-polarfire-soc
5041cb17956b v6.1/standard/bcm-2xxx-rpi
ddfe0d272915 v6.1/standard/preempt-rt/bcm-2xxx-rpi
af96f8f60568 v6.1/standard/nxp-sdk-5.15/nxp-s32g
02e02552af24 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
63c8fff4f0bf v6.1/standard/intel-sdk-6.1/intel-socfpga
14571b8b43c5 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
7513a0ea6974 v6.1/standard/x86
f8c02ebcfdf6 v6.1/standard/preempt-rt/x86
6738d2c3b473 v6.1/standard/sdkv6.1/xlnx-soc
3049cfd527ba v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
In this stable upgrade, there are some textual conflicts on the nxp and octeon
branches. Additionally, on the nxp branch, there are some semantic conflicts,
but they are not particularly 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 (#13427):
https://lists.yoctoproject.org/g/linux-yocto/message/13427
Mute This Topic: https://lists.yoctoproject.org/mt/103170904/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
