Hi Bruce,
This is a trial merge of the stable kernel v6.1.104 v6.6.45 for the following
branches in the linux-yocto.
bb1aa35c714c v6.1/standard/sdkv5.10/axxia
f62f37b8db21 v6.1/standard/preempt-rt/sdkv5.10/axxia
f55595e717e3 v6.1/standard/base
8ae3b53b1142 v6.1/standard/preempt-rt/base
68b8137f06d0 v6.1/standard/ti-sdk-6.1/ti-j7xxx
6031a1d99415 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
f8f5dbfd11bc v6.1/standard/nxp-sdk-6.1/nxp-soc
b0cad22f18fe v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
0736f15a6c94 v6.1/standard/cn-sdkv5.15/octeon
a16e9080eb3b v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
ff949f1d6822 v6.1/standard/cn-sdkv6.1/octeon
9c142e231eb4 v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
7af222caffec v6.1/standard/microchip-polarfire-soc
3d848f0c6545 v6.1/standard/preempt-rt/microchip-polarfire-soc
7a7d01a35d4d v6.1/standard/bcm-2xxx-rpi
1af17b06d018 v6.1/standard/preempt-rt/bcm-2xxx-rpi
eb02425dc39e v6.1/standard/nxp-sdk-5.15/nxp-s32g
ca657689cc11 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
29ac144b60f8 v6.1/standard/intel-sdk-6.1/intel-socfpga
dea79bfa2666 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
6545c2f31d64 v6.1/standard/x86
a3683a530e54 v6.1/standard/preempt-rt/x86
c56a236f10f2 v6.1/standard/sdkv6.1/xlnx-soc
#Have textual conflicts
db51b234223b v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
#Have textual conflicts
19bcd85c4a3f v6.6/standard/sdkv5.15/axxia
94c4f50e7037 v6.6/standard/preempt-rt/sdkv5.15/axxia
1937d5b00ed1 v6.6/standard/base
ea8bf5a76929 v6.6/standard/preempt-rt/base
7ef9a9110ecb v6.6/standard/nxp-sdk-6.6/nxp-soc
#Have textual and semantic conflicts
c4054cbcb450 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
#Have textual and semantic conflicts
fdceccf7c566 v6.6/standard/cn-sdkv6.1/octeon
4bc9866548d0 v6.6/standard/preempt-rt/cn-sdkv6.1/octeon
8484ec55082f v6.6/standard/microchip-polarfire-soc
06ea28c36fc7 v6.6/standard/preempt-rt/microchip-polarfire-soc
e8fd3c8bc5b4 v6.6/standard/nxp-sdk-6.6/nxp-s32g
#Have textual conflicts
9709cc07464b v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
#Have textual conflicts
13832b1f7be4 v6.6/standard/ti-sdk-6.6/ti-soc
d520352d6336 v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc
3cf24026dba8 v6.6/standard/sdkv6.6/xlnx-soc
#Have textual conflicts
1a4b67dab265 v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc
#Have textual conflicts
There are many nasty merge conflicts in the v6.6 nxp branches, and I hope I've
resolved them all correctly. The other merge conflicts weren't as problematic.
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 (#14234):
https://lists.yoctoproject.org/g/linux-yocto/message/14234
Mute This Topic: https://lists.yoctoproject.org/mt/107871663/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
