Hi Bruce, This is a trial merge of the stable kernel v5.15.138 v6.1.62 for the following branches in the linux-yocto. 574d18041760 v5.15/standard/sdkv5.10/axxia 93bb4527132f v5.15/standard/preempt-rt/sdkv5.10/axxia f5a3cb02c7d2 v5.15/standard/base 49e93beee1ca v5.15/standard/preempt-rt/base ac1a2bb980fc v5.15/standard/cn-sdkv5.4/octeon f26a78ed79af v5.15/standard/preempt-rt/cn-sdkv5.4/octeon a1948c622f16 v5.15/standard/cn-sdkv5.15/octeon 381511e3528a v5.15/standard/preempt-rt/cn-sdkv5.15/octeon a6c2c66c0395 v5.15/standard/ti-sdk-5.10/ti-j72xx #Have textual conflicts 931fdccfe1da v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx #Have textual conflicts c048b0a4de1c v5.15/standard/nxp-sdk-5.15/nxp-soc #Have textual conflicts 18f411306c91 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc #Have textual conflicts 2665bb0b35bc v5.15/standard/bcm-2xxx-rpi e0b18d557cc3 v5.15/standard/preempt-rt/bcm-2xxx-rpi 405a7a7382db v5.15/standard/nxp-sdk-5.15/nxp-s32g ded4c81101e3 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 47ebca7f3a23 v5.15/standard/intel-sdk-5.15/intel-socfpga ed8dbc98f0c2 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga 2e6659321bfb v5.15/standard/x86 e7fa2aaa4285 v5.15/standard/preempt-rt/x86 c310224adbb2 v5.15/standard/sdkv5.15/xlnx-soc 388e207e7604 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc 272a2db4fc3f v6.1/standard/sdkv5.10/axxia 68c76acc339b v6.1/standard/preempt-rt/sdkv5.10/axxia 107b3f203def v6.1/standard/base f999d829c5a1 v6.1/standard/preempt-rt/base f57c6fdffb25 v6.1/standard/ti-sdk-6.1/ti-j7xxx 5fdeaa9fd07b v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx fab26fbf4932 v6.1/standard/nxp-sdk-6.1/nxp-soc #Have textual conflicts ecc9c4f5fadd v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc #Have textual conflicts 1854ade0c2e7 v6.1/standard/cn-sdkv5.15/octeon 4d16ddfba6eb v6.1/standard/preempt-rt/cn-sdkv5.15/octeon 02a76d6206b3 v6.1/standard/bcm-2xxx-rpi ad5b76314c35 v6.1/standard/preempt-rt/bcm-2xxx-rpi d36bd6d0aca0 v6.1/standard/nxp-sdk-5.15/nxp-s32g 00cd6c0c3ae5 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 89ca6b815382 v6.1/standard/intel-sdk-6.1/intel-socfpga a5918deaaf73 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga 12038703bc7c v6.1/standard/x86 0292e0e810d4 v6.1/standard/preempt-rt/x86 30b97e84d84b v6.1/standard/sdkv6.1/xlnx-soc 3156296dfa96 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
There are only some minor merge conflicts in the TI and NXP branches, everything else is fine. 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 (#13277): https://lists.yoctoproject.org/g/linux-yocto/message/13277 Mute This Topic: https://lists.yoctoproject.org/mt/102484102/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-