On Fri, Sep 15, 2023 at 3:23 AM Kevin Hao <haoke...@gmail.com> wrote: > > Hi Bruce, > > This is a trial merge of the stable kernel v6.1.53 for the following branches > in the linux-yocto. > 29c627ebaa15 v6.1/standard/ti-sdk-6.1/ti-j7xxx > #Have textual conflicts > c542e98320f4 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx > #Have textual conflicts > 59c6d9ddbcff v6.1/standard/nxp-sdk-6.1/nxp-soc > #Have textual conflicts > 7f8acf64718f v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc > #Have textual conflicts > 4c1457a7fde7 v6.1/standard/cn-sdkv5.15/octeon > #Have build errors > 630f186e67ba v6.1/standard/preempt-rt/cn-sdkv5.15/octeon > #Have textual and semantic conflicts > 6fdb97c05d02 v6.1/standard/preempt-rt/bcm-2xxx-rpi > #Have textual conflicts > 20494a8d01a6 v6.1/standard/sdkv6.1/xlnx-soc > #Have textual conflicts > 1d934f4f3356 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc > #Have textual conflicts > > Since some of the branches have already been bumped to v6.1.53, so I didn't > list > all of them as usual. But I did perform build test on all of them. An addon > patch was introduced to fix the build error on the octeon branch. 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. that is VERY helpful on the BSP semantic issues. I've done the resolutions and all 6.1 branches should be on the same -stable now. Bruce > 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 (#13071): https://lists.yoctoproject.org/g/linux-yocto/message/13071 Mute This Topic: https://lists.yoctoproject.org/mt/101375223/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] -=-=-=-=-=-=-=-=-=-=-=-
