Hi Bruce,
This is a trial merge of the stable kernel v5.15.165 v6.1.105 v6.1.106 v6.6.46
v6.6.47 for the following branches in the linux-yocto.
ca0453802e94 v5.15/standard/sdkv5.10/axxia
2f9637f0a68e v5.15/standard/preempt-rt/sdkv5.10/axxia
b1abc451a3ae v5.15/standard/base
fa8a1d06d5bd v5.15/standard/preempt-rt/base
1cae4c79eaa6 v5.15/standard/cn-sdkv5.4/octeon
#Have textual conflicts
53472813dcd8 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
#Have textual conflicts
48ed9aa3ad90 v5.15/standard/cn-sdkv5.15/octeon
#Have textual conflicts
d70f8306f1a7 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual conflicts
56b5033e6725 v5.15/standard/ti-sdk-5.10/ti-j72xx
0d654b17399d v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
#Have textual conflicts
8c2d57524dfe v5.15/standard/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
6eedf10a67b1 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
5a20033bad1f v5.15/standard/bcm-2xxx-rpi
#Have textual conflicts
5caebdbeddd3 v5.15/standard/preempt-rt/bcm-2xxx-rpi
#Have textual conflicts
84f65bfd3e89 v5.15/standard/nxp-sdk-5.15/nxp-s32g
05d5349f6521 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
7496e2a937ec v5.15/standard/intel-sdk-5.15/intel-socfpga
b5ec2e4afc4f v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
f54ed1bfbee2 v5.15/standard/x86
d1f74709c6d7 v5.15/standard/preempt-rt/x86
40af4939c975 v5.15/standard/sdkv5.15/xlnx-soc
#Have textual conflicts
50ec6659e5be v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
#Have textual conflicts
20e929ca41e4 v6.1/standard/sdkv5.10/axxia
6df92453582f v6.1/standard/preempt-rt/sdkv5.10/axxia
9a1c7f46917e v6.1/standard/base
f0c40ed16b9a v6.1/standard/preempt-rt/base
169f404a6577 v6.1/standard/ti-sdk-6.1/ti-j7xxx
12c9a521700f v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
662192531003 v6.1/standard/nxp-sdk-6.1/nxp-soc
4e17d4414501 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
898a4482dcdf v6.1/standard/cn-sdkv5.15/octeon
#Have textual conflicts
e114ecb17bc8 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual conflicts
b47ed9c39d12 v6.1/standard/cn-sdkv6.1/octeon
#Have textual conflicts
328b449d4dc0 v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
#Have textual conflicts
87403d415c59 v6.1/standard/microchip-polarfire-soc
f4a731ccde24 v6.1/standard/preempt-rt/microchip-polarfire-soc
7c8e51e26a2b v6.1/standard/bcm-2xxx-rpi
#Have textual conflicts
3869de2d52b3 v6.1/standard/preempt-rt/bcm-2xxx-rpi
#Have textual conflicts
947c1642c86e v6.1/standard/nxp-sdk-5.15/nxp-s32g
#Have textual conflicts
aacba573baa8 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
#Have textual conflicts
ef745a35d71f v6.1/standard/intel-sdk-6.1/intel-socfpga
ad4e6cf244b2 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
fb62d7186db7 v6.1/standard/x86
e578eebf3bb2 v6.1/standard/preempt-rt/x86
d8e775c3da66 v6.1/standard/sdkv6.1/xlnx-soc
1a7f5749287d v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
ef1934a73d96 v6.6/standard/sdkv5.15/axxia
#Have textual conflicts
9278a58ab633 v6.6/standard/preempt-rt/sdkv5.15/axxia
#Have textual conflicts
12bd0d8b645e v6.6/standard/base
19e4ae7e282d v6.6/standard/preempt-rt/base
de1eee65edb8 v6.6/standard/nxp-sdk-6.6/nxp-soc
6e11072fa707 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
ee5118b6314d v6.6/standard/cn-sdkv6.1/octeon
dc5417c072f5 v6.6/standard/preempt-rt/cn-sdkv6.1/octeon
5612527b382d v6.6/standard/microchip-polarfire-soc
0f3501462893 v6.6/standard/preempt-rt/microchip-polarfire-soc
f463640ae00c v6.6/standard/bcm-2xxx-rpi
#Have textual conflicts
f2c7da8cfda7 v6.6/standard/preempt-rt/bcm-2xxx-rpi
#Have textual conflicts
c8014d2099ca v6.6/standard/nxp-sdk-6.6/nxp-s32g
a047b3f7d462 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
80312db3b73f v6.6/standard/ti-sdk-6.6/ti-soc
#Have textual conflicts
49805ee71e8b v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc
#Have textual conflicts
20861fbc2bf5 v6.6/standard/sdkv6.6/xlnx-soc
97bae4ae6f71 v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc
This time there are more stable kernel versions, so there are also more merge
conflicts,
but none of them are particularly complex. 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 (#14292):
https://lists.yoctoproject.org/g/linux-yocto/message/14292
Mute This Topic: https://lists.yoctoproject.org/mt/107998843/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
