Hi Bruce,
This is a trial merge of the stable kernel v5.15.158 v6.1.90 v6.6.30 for the
following branches in the linux-yocto.
20f06c631ff4 v5.15/standard/sdkv5.10/axxia
d244180a190c v5.15/standard/preempt-rt/sdkv5.10/axxia
92abce38992e v5.15/standard/base
bcd78f60b44c v5.15/standard/preempt-rt/base
4dfa027838c5 v5.15/standard/cn-sdkv5.4/octeon
135884bb9baf v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
184d00c5d9ea v5.15/standard/cn-sdkv5.15/octeon
5803d5146e4c v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
091b18ed0e8b v5.15/standard/ti-sdk-5.10/ti-j72xx
f07dd0e97d65 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
90d240631487 v5.15/standard/nxp-sdk-5.15/nxp-soc
f077d7e2d3e9 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
a2f35a1b24ba v5.15/standard/bcm-2xxx-rpi
83ffe435b64f v5.15/standard/preempt-rt/bcm-2xxx-rpi
f861fc546bd7 v5.15/standard/nxp-sdk-5.15/nxp-s32g
d9c22cd22fe0 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
83f92eb6d0da v5.15/standard/intel-sdk-5.15/intel-socfpga
a824407d54dc v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
ac7d2fbd4112 v5.15/standard/x86
66ee4d046b14 v5.15/standard/preempt-rt/x86
2889d72d5db2 v5.15/standard/sdkv5.15/xlnx-soc
10c6587afadc v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
5953cc2b728b v6.1/standard/sdkv5.10/axxia
e3377e248980 v6.1/standard/preempt-rt/sdkv5.10/axxia
b0558510bc38 v6.1/standard/base
0a56e94f3d13 v6.1/standard/preempt-rt/base
9f450da05bfa v6.1/standard/ti-sdk-6.1/ti-j7xxx
ee7d597dbf23 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
17ae56b529fa v6.1/standard/nxp-sdk-6.1/nxp-soc
#Have textual and semantic conflicts
15d9cd249631 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
#Have textual and semantic conflicts
a5f083a227a5 v6.1/standard/cn-sdkv5.15/octeon
dca0c220634d v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
908ffe860bb8 v6.1/standard/cn-sdkv6.1/octeon
67fa4b9e9bf6 v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
ed27fa178a4b v6.1/standard/microchip-polarfire-soc
c224e6d4b58b v6.1/standard/preempt-rt/microchip-polarfire-soc
81fae813109c v6.1/standard/bcm-2xxx-rpi
23b560d98bd1 v6.1/standard/preempt-rt/bcm-2xxx-rpi
a315beb38f4e v6.1/standard/nxp-sdk-5.15/nxp-s32g
#Have textual conflicts
ec5f550210ac v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
#Have textual conflicts
e84599d1d547 v6.1/standard/intel-sdk-6.1/intel-socfpga
a906eba30c3a v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
8dc5f30b2a45 v6.1/standard/x86
32a6deea284f v6.1/standard/preempt-rt/x86
5955d51b19d1 v6.1/standard/sdkv6.1/xlnx-soc
3fd0a55bcb2a v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
376914c05baa v6.6/standard/base
14cf296a7524 v6.6/standard/preempt-rt/base
c1d8ff981f56 v6.6/standard/nxp-sdk-6.6/nxp-soc
2dfc8ac46df7 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
- Several minor merge conflicts on the v6.1 s32g branches.
- There are many nasty merge conflicts on the v6.1 nxp branches, I hope I have
resolved them 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.
Thanks,
Kevin
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13889):
https://lists.yoctoproject.org/g/linux-yocto/message/13889
Mute This Topic: https://lists.yoctoproject.org/mt/105884763/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
