Thanks Kevin, I've done the merges, and indeed, only the xlnx branches have issues.
Bruce On Mon, Jun 5, 2023 at 8:49 AM Kevin Hao <[email protected]> wrote: > > Hi Bruce, > > This is a trial merge of the stable kernel v5.15.115 v6.1.32 for the > following branches in the linux-yocto. > 3f02107476a2 v5.15/standard/sdkv5.10/axxia > 41fceb476385 v5.15/standard/preempt-rt/sdkv5.10/axxia > 53741a09dcbd v5.15/standard/base > 98cba64b4f1d v5.15/standard/preempt-rt/base > 7e9822fb32f5 v5.15/standard/cn-sdkv5.4/octeon > fb2919d7b815 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon > 71ffd99e3a8c v5.15/standard/cn-sdkv5.15/octeon > e8427b210cf8 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon > 514b78c6284a v5.15/standard/ti-sdk-5.10/ti-j72xx > 4ba44e533676 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx > b6dcefa885de v5.15/standard/nxp-sdk-5.15/nxp-soc > 76a66bb282f9 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc > 0b55338ba72f v5.15/standard/bcm-2xxx-rpi > 396ccb2a8150 v5.15/standard/preempt-rt/bcm-2xxx-rpi > 37e7afc3511e v5.15/standard/nxp-sdk-5.15/nxp-s32g > 970662f744a2 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > e805b15e054b v5.15/standard/intel-sdk-5.15/intel-socfpga > 7e90565c9938 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga > 67b9b39444dd v5.15/standard/x86 > 51b8dbfc66a3 v5.15/standard/preempt-rt/x86 > 7fcd19fcd65a v5.15/standard/sdkv5.15/xlnx-soc > #Have textual conflicts > 039ae6674a14 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc > #Have textual conflicts > 64c0e1aead3a v6.1/standard/base > c72c9cd61636 v6.1/standard/preempt-rt/base > 5e81a008eb5c v6.1/standard/ti-sdk-5.10/ti-j7xxx > 58862d7786e8 v6.1/standard/preempt-rt/ti-sdk-5.10/ti-j7xxx > 605b818f3e36 v6.1/standard/nxp-sdk-6.1/nxp-soc > d4c989f94d4b v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc > f93704aa07b6 v6.1/standard/bcm-2xxx-rpi > c7ece8f60ed9 v6.1/standard/preempt-rt/bcm-2xxx-rpi > 045daac35ae4 v6.1/standard/nxp-sdk-5.15/nxp-s32g > 7c74b276c133 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > 64c0e1aead3a v6.1/standard/x86 > b88390f7a4c4 v6.1/standard/preempt-rt/x86 > bf3836c1b6ce v6.1/standard/sdkv6.1/xlnx-soc > #Have textual conflicts > 6d17afc7b0a3 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc > #Have textual conflicts > > This stable release seems almost perfect and there is only a very trivial > conflict. > 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 -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12697): https://lists.yoctoproject.org/g/linux-yocto/message/12697 Mute This Topic: https://lists.yoctoproject.org/mt/99339363/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
