Hi Bruce,
This is a trial merge of the stable kernel v5.15.139 v6.1.63 for the following
branches in the linux-yocto.
d6ca19b1a773 v5.15/standard/sdkv5.10/axxia
fb50e151bae1 v5.15/standard/preempt-rt/sdkv5.10/axxia
ac9d54b0bf0a v5.15/standard/base
105a85f8a9f2 v5.15/standard/preempt-rt/base
212201ecb412 v5.15/standard/cn-sdkv5.4/octeon
6637451df9aa v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
d58f49ec2379 v5.15/standard/cn-sdkv5.15/octeon
30530ac33cde v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
535d8de45c48 v5.15/standard/ti-sdk-5.10/ti-j72xx
#Have textual conflicts
c94f22c5b3d7 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
#Have textual conflicts
57147eff5570 v5.15/standard/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
ecba4a234377 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
aef7286e72ad v5.15/standard/bcm-2xxx-rpi
38e47741204a v5.15/standard/preempt-rt/bcm-2xxx-rpi
25ae86cf517d v5.15/standard/nxp-sdk-5.15/nxp-s32g
8d683e672a54 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
48229b20905e v5.15/standard/intel-sdk-5.15/intel-socfpga
562c0661de9d v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
94d4f096d534 v5.15/standard/x86
8927bf8fb8e5 v5.15/standard/preempt-rt/x86
927319057fe7 v5.15/standard/sdkv5.15/xlnx-soc
c8d30ffd456d v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
b0b0eac96b4d v6.1/standard/sdkv5.10/axxia
de544d22c03d v6.1/standard/preempt-rt/sdkv5.10/axxia
3003509e5bde v6.1/standard/base
4d3e72527f7f v6.1/standard/preempt-rt/base
680990394cd1 v6.1/standard/ti-sdk-6.1/ti-j7xxx
#Have textual conflicts
8d318eb8f421 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
#Have textual conflicts
7cdad1815a87 v6.1/standard/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
853f650ad8b6 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
4660fe175ed9 v6.1/standard/cn-sdkv5.15/octeon
#Have textual and semantic conflicts
343a57e0f3e6 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual and semantic conflicts
7862e6a3a25f v6.1/standard/microchip-polarfire-soc
f9961264cba0 v6.1/standard/preempt-rt/microchip-polarfire-soc
0c5740e814cb v6.1/standard/bcm-2xxx-rpi
#Have textual conflicts
164b5e3ff83f v6.1/standard/preempt-rt/bcm-2xxx-rpi
#Have textual conflicts
27738d3393bd v6.1/standard/nxp-sdk-5.15/nxp-s32g
a5d8408db20e v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
19326d3c239d v6.1/standard/intel-sdk-6.1/intel-socfpga
97f405a0b6c0 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
080ce09be0ad v6.1/standard/x86
9ae37d2836f4 v6.1/standard/preempt-rt/x86
49e729944b8c v6.1/standard/sdkv6.1/xlnx-soc
306e6cd7a639 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
A bug was found on the v5.15/standard/cn-sdkv5.15/octeon branch, but it has
nothing
to do with the stable update. A separate patch [1] for it was already sent to
linux-yocto.
The v6.1.63 is a much bigger release than normal, I have got many nasty merge
conflicts on the octeon branches. I hope I have resolved them all correctly.
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.
[1] https://lists.yoctoproject.org/g/linux-yocto/message/13304
Thanks,
Kevin
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13305):
https://lists.yoctoproject.org/g/linux-yocto/message/13305
Mute This Topic: https://lists.yoctoproject.org/mt/102739396/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
