On Fri, Apr 14, 2023 at 4:49 AM Kevin hao <[email protected]> wrote: > > Hi Bruce, > > This is a trial merge of the stable kernel v5.15.107 v6.1.24 for the > following branches in the linux-yocto. > 006cb0818243 v5.15/standard/sdkv5.10/axxia > 3ae0d174d1fe v5.15/standard/preempt-rt/sdkv5.10/axxia > 23e09fdef7b3 v5.15/standard/base > 233f9b47855c v5.15/standard/cn-sdkv5.4/octeon > dec53aaddbad v5.15/standard/preempt-rt/cn-sdkv5.4/octeon > 30184119ae7e v5.15/standard/ti-sdk-5.10/ti-j72xx > 93f88b4c2146 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx > e87728d20e53 v5.15/standard/nxp-sdk-5.15/nxp-soc > 7fc3a0437947 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc > fa8808678e0a v5.15/standard/bcm-2xxx-rpi > b1327ce851c7 v5.15/standard/preempt-rt/bcm-2xxx-rpi > 8ceed19a4f04 v5.15/standard/nxp-sdk-5.15/nxp-s32g > 6bdee1283650 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > 739826eaa9ee v5.15/standard/intel-sdk-5.15/intel-socfpga > fdb416e75857 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga > ca25592f3e10 v5.15/standard/x86 > c2b6a7298470 v5.15/standard/preempt-rt/x86 > 76d946960fe6 v5.15/standard/sdkv5.15/xlnx-soc > 0ae440ea2ca1 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc > ea444536b477 v6.1/standard/base > 7f89f69d9129 v6.1/standard/bcm-2xxx-rpi > 3d7bb6f01bc1 v6.1/standard/preempt-rt/bcm-2xxx-rpi > > No merge conflict for all the branches, but there is a build failure for the > following two branches: > v5.15/standard/cn-sdkv5.4/octeon > v5.15/standard/preempt-rt/cn-sdkv5.4/octeon > > I have staged a fix for these two branches and 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, I've gone through 6.1 and 5.15 bumps now, and cherry-picked your build fixes onto the branches. SRCREV bumps will follow to oe-core shortly. 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 (#12385): https://lists.yoctoproject.org/g/linux-yocto/message/12385 Mute This Topic: https://lists.yoctoproject.org/mt/98258289/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
