In message: Trial merge of v5.15.146 v6.1.71 v6.1.72 for linux-yocto on 11/01/2024 Kevin Hao wrote:
> Hi Bruce, > > This is a trial merge of the stable kernel v5.15.146 v6.1.71 v6.1.72 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 > 56fe3933e51e v5.15/standard/nxp-sdk-5.15/nxp-s32g > 604ff2c32d51 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 > 487e6be1e796 v6.1/standard/sdkv5.10/axxia > 09ca58d30a61 v6.1/standard/preempt-rt/sdkv5.10/axxia > 65cb43829f54 v6.1/standard/base > 9b470c6b1a4a v6.1/standard/preempt-rt/base > 3d7f492abb3b v6.1/standard/ti-sdk-6.1/ti-j7xxx > 083c31589a50 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx > 43b4ace727bd v6.1/standard/nxp-sdk-6.1/nxp-soc > #Have textual conflicts > e19ab0994bf0 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc > #Have textual conflicts > 01933fe845f3 v6.1/standard/cn-sdkv5.15/octeon > #Have textual conflicts > 81e3ecfaa788 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon > #Have textual conflicts > 759be0248278 v6.1/standard/microchip-polarfire-soc > 963104e893a5 v6.1/standard/preempt-rt/microchip-polarfire-soc > a225b604b23e v6.1/standard/bcm-2xxx-rpi > 1b6aec075c14 v6.1/standard/preempt-rt/bcm-2xxx-rpi > b7ec6e79cb49 v6.1/standard/nxp-sdk-5.15/nxp-s32g > 8d09c3db19f5 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > 576be20178bb v6.1/standard/intel-sdk-6.1/intel-socfpga > eb99988e1dd2 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga > c67028a29335 v6.1/standard/x86 > 239989bc7c91 v6.1/standard/preempt-rt/x86 > a578437b296a v6.1/standard/sdkv6.1/xlnx-soc > #Have textual conflicts > 3629413a658c 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 Thanks Kevin, I've done the same -stable updates here and everything has passed the standard BSP build / boot tests. Bruce > > 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 (#13481): https://lists.yoctoproject.org/g/linux-yocto/message/13481 Mute This Topic: https://lists.yoctoproject.org/mt/103659660/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
