Hi Bruce, This is a trial merge of the stable kernel v5.15.146 v6.1.71 for the following branches in the linux-yocto. b5fbbdffbd1d v5.15/standard/sdkv5.10/axxia 34c731e80124 v5.15/standard/preempt-rt/sdkv5.10/axxia 78df6de45c41 v5.15/standard/base c003aea6270f v5.15/standard/preempt-rt/base acda83875cf7 v5.15/standard/cn-sdkv5.4/octeon b565626a26a3 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon a3dcf258cbda v5.15/standard/cn-sdkv5.15/octeon 7d89a56da9b7 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon ed0cc8da2e88 v5.15/standard/ti-sdk-5.10/ti-j72xx e28b530e6247 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx ffe5852a2c7f v5.15/standard/nxp-sdk-5.15/nxp-soc 81fea11e748b v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc c3b0326a9836 v5.15/standard/bcm-2xxx-rpi c599c658073f v5.15/standard/preempt-rt/bcm-2xxx-rpi d39a42fc569b v5.15/standard/nxp-sdk-5.15/nxp-s32g 5b73c5ac2f8a v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 726eca2a66d9 v5.15/standard/intel-sdk-5.15/intel-socfpga 6be2426ec014 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga 2db857672ddf v5.15/standard/x86 cdb2d700d0d4 v5.15/standard/preempt-rt/x86 9a2c2745484a v5.15/standard/sdkv5.15/xlnx-soc #Have textual conflicts bb6eeb27272b v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc #Have textual conflicts bc1e00693f7d v6.1/standard/sdkv5.10/axxia 2442c66b2822 v6.1/standard/preempt-rt/sdkv5.10/axxia 4b504fd1ae2f v6.1/standard/base b4b34c2b72a7 v6.1/standard/preempt-rt/base b66b61efb8b4 v6.1/standard/ti-sdk-6.1/ti-j7xxx ccf4ee87c3b1 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx b455fb08ea3d v6.1/standard/nxp-sdk-6.1/nxp-soc 7d66c00d2818 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc fbc1fd50938c v6.1/standard/cn-sdkv5.15/octeon ddaf7bbfe37b v6.1/standard/preempt-rt/cn-sdkv5.15/octeon 5cf4cfacd205 v6.1/standard/microchip-polarfire-soc 2e6c88130fc9 v6.1/standard/preempt-rt/microchip-polarfire-soc 801e4d8f8997 v6.1/standard/bcm-2xxx-rpi d7cfb9055340 v6.1/standard/preempt-rt/bcm-2xxx-rpi fa5cdc5acf34 v6.1/standard/nxp-sdk-5.15/nxp-s32g 6b7b30bdbde0 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g b322008a9205 v6.1/standard/intel-sdk-6.1/intel-socfpga 0c10077e5ab6 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga dd4ad840631c v6.1/standard/x86 155a3986a81d v6.1/standard/preempt-rt/x86 f6acb4dcf540 v6.1/standard/sdkv6.1/xlnx-soc #Have textual conflicts 9145384f0789 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc #Have textual conflicts
In this stable release, there are many bloody merge conflicts on the v6.1 xlnx-soc branches. These conflicts are caused by the similar changes in both stable kernel and SDK patches. We can resolve them by favoring the SDK version. 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 (#13455): https://lists.yoctoproject.org/g/linux-yocto/message/13455 Mute This Topic: https://lists.yoctoproject.org/mt/103555667/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-