Hi Bruce,
This is a trial merge of the stable kernel v5.15.176 v6.1.124 v6.6.70 for the
following branches in the linux-yocto.
5ef1eda01caf v5.15/standard/sdkv5.10/axxia
6476161f87ae v5.15/standard/preempt-rt/sdkv5.10/axxia
8937fb3f74dc v5.15/standard/base
c48b9cef93c7 v5.15/standard/preempt-rt/base
652a5673d773 v5.15/standard/cn-sdkv5.4/octeon
6d4d3ba41d86 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
aefd619f1d4e v5.15/standard/cn-sdkv5.15/octeon
257e179847a8 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
0a032f62fc0d v5.15/standard/ti-sdk-5.10/ti-j72xx
23e19cd83381 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
11fbbc60fa82 v5.15/standard/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
124e59910612 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
2627c1d6a148 v5.15/standard/nvidia-orin
a6956dd4e171 v5.15/standard/preempt-rt/nvidia-orin
c8a67eb61fe2 v5.15/standard/bcm-2xxx-rpi
13109d7e96b2 v5.15/standard/preempt-rt/bcm-2xxx-rpi
6669b094181e v5.15/standard/nxp-sdk-5.15/nxp-s32g
7fde7a6a1897 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
4c559277b110 v5.15/standard/intel-sdk-5.15/intel-socfpga
50b1efac234f v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
04875ebe0620 v5.15/standard/x86
537321e9049b v5.15/standard/preempt-rt/x86
786d85a3a73c v5.15/standard/sdkv5.15/xlnx-soc
a957cff06b53 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
b927aa1d4824 v6.1/standard/sdkv5.10/axxia
1f82e77411a4 v6.1/standard/preempt-rt/sdkv5.10/axxia
ba4570bbb940 v6.1/standard/base
8f5f4f1ee57f v6.1/standard/preempt-rt/base
3f6c1b89fb7f v6.1/standard/ti-sdk-6.1/ti-j7xxx
cb24bb1e8762 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
160c151f83ed v6.1/standard/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
1a901a832977 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
9e130a779c08 v6.1/standard/cn-sdkv5.15/octeon
3e2f66ff9914 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
ef5417b3e569 v6.1/standard/cn-sdkv6.1/octeon
3c53bcbbb061 v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
9fa9729350a2 v6.1/standard/microchip-polarfire-soc
00634927aff8 v6.1/standard/preempt-rt/microchip-polarfire-soc
c0a1685287a7 v6.1/standard/bcm-2xxx-rpi
ff94c2fcd76e v6.1/standard/preempt-rt/bcm-2xxx-rpi
b7741561e5f9 v6.1/standard/nxp-sdk-5.15/nxp-s32g
ce433ce622de v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
0a2db607a42c v6.1/standard/intel-sdk-6.1/intel-socfpga
b5bf5572ae44 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
6771f4602aab v6.1/standard/x86
ad381ea3531f v6.1/standard/preempt-rt/x86
5c3708d302b8 v6.1/standard/sdkv6.1/xlnx-soc
7dde17327bc8 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
ce1765e5b2f2 v6.6/standard/sdkv5.15/axxia
0e70601b2ed4 v6.6/standard/preempt-rt/sdkv5.15/axxia
85afdcd6d087 v6.6/standard/base
2642cfdabe55 v6.6/standard/preempt-rt/base
0678f98529be v6.6/standard/nxp-sdk-6.6/nxp-soc
#Have textual conflicts
dda3ab0efec3 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
#Have textual conflicts
ad70c19779f1 v6.6/standard/cn-sdkv6.1/octeon
#Have textual and semantic conflicts
ecb3bdef67c5 v6.6/standard/preempt-rt/cn-sdkv6.1/octeon
#Have textual and semantic conflicts
a2a424f176d6 v6.6/standard/microchip-polarfire-soc
fff4ecc9b569 v6.6/standard/preempt-rt/microchip-polarfire-soc
d257af1936bb v6.6/standard/bcm-2xxx-rpi
5725bfbe81b9 v6.6/standard/preempt-rt/bcm-2xxx-rpi
1874f1857cc8 v6.6/standard/nxp-sdk-6.6/nxp-s32g
963be4b573dd v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
8077db59e7e0 v6.6/standard/intel-sdk-6.6/intel-socfpga
abbcac8abdc2 v6.6/standard/preempt-rt/intel-sdk-6.6/intel-socfpga
69fc0d434718 v6.6/standard/ti-sdk-6.6/ti-soc
08876f31483f v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc
50b6805ff021 v6.6/standard/x86
ae31d54f59e4 v6.6/standard/preempt-rt/x86
c1f5a7623b52 v6.6/standard/sdkv6.6/xlnx-soc
#Have textual conflicts
da870be718db v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc
#Have textual conflicts
Please note the semantic conflicts in the v6.6 octeon branches.
All branches have passed my build tests, and I have pushed them 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 (#14732):
https://lists.yoctoproject.org/g/linux-yocto/message/14732
Mute This Topic: https://lists.yoctoproject.org/mt/110530990/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
