On Thu, Aug 03, 2023 at 01:48:10PM -0400, Bruce Ashfield wrote: > On Thu, Aug 3, 2023 at 10:26 AM Kevin Hao <[email protected]> wrote: > > > > Hi Bruce, > > > > This is a trial merge of the stable kernel v5.15.124 v6.1.43 for the > > following branches in the linux-yocto. > > 2c2ea4b6dc52 v5.15/standard/sdkv5.10/axxia > > fdaa6dbceddc v5.15/standard/preempt-rt/sdkv5.10/axxia > > 821af899511f v5.15/standard/base > > b6ee805bd511 v5.15/standard/preempt-rt/base > > 962ade79d73c v5.15/standard/cn-sdkv5.4/octeon > > b64354196762 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon > > a1a37982704e v5.15/standard/cn-sdkv5.15/octeon > > 9c4226add92a v5.15/standard/preempt-rt/cn-sdkv5.15/octeon > > 05c5b6733011 v5.15/standard/ti-sdk-5.10/ti-j72xx > > 3b9d2b7635a8 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx > > 3ecd60e382a0 v5.15/standard/nxp-sdk-5.15/nxp-soc > > #Have textual conflicts > > 9d06de49b7a7 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc > > #Have textual conflicts > > f37d75f635c1 v5.15/standard/bcm-2xxx-rpi > > #Have textual conflicts > > 3a7a78ebc394 v5.15/standard/preempt-rt/bcm-2xxx-rpi > > 37b7dbf186f5 v5.15/standard/nxp-sdk-5.15/nxp-s32g > > 21354ed99b4e v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > > ca7153ffb57d v5.15/standard/intel-sdk-5.15/intel-socfpga > > 1cb259f7b300 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga > > 13fcf728a848 v5.15/standard/x86 > > 2021d510763b v5.15/standard/preempt-rt/x86 > > e07ecdfb95d5 v5.15/standard/sdkv5.15/xlnx-soc > > #Have textual conflicts > > cb1c0389b8ae v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc > > #Have textual conflicts > > 9ce3102d374e v6.1/standard/base > > 32577835e6cc v6.1/standard/preempt-rt/base > > c56fe4f54ee9 v6.1/standard/ti-sdk-6.1/ti-j7xxx > > 9cfc5bce4ec4 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx > > d2829f0717cf v6.1/standard/nxp-sdk-6.1/nxp-soc > > d381f891de33 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc > > 3d78c3498338 v6.1/standard/cn-sdkv5.15/octeon > > #Have textual conflicts > > 6ae6a3fb0ec0 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon > > #Have textual conflicts > > 82688a4beb53 v6.1/standard/bcm-2xxx-rpi > > #Have textual conflicts > > 82726569e63b v6.1/standard/preempt-rt/bcm-2xxx-rpi > > #Have textual conflicts > > 5f1eeeb0964a v6.1/standard/nxp-sdk-5.15/nxp-s32g > > #Have textual conflicts > > dd288b2732d3 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > > #Have textual conflicts > > d6782e78fa9c v6.1/standard/intel-sdk-6.1/intel-socfpga > > 0043b66f81f3 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga > > 2f3bf45beefc v6.1/standard/x86 > > 4fd513c22742 v6.1/standard/preempt-rt/x86 > > 719f4a7b31c1 v6.1/standard/sdkv6.1/xlnx-soc > > #Have textual conflicts > > 4583b2be504d v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc > > #Have textual conflicts > > > > This seems a normal stable release. There are several merge conflicts, but > > none > > of them seems too nasty. All the branches have passed my build test. I have > > pushed all these branches to: > > https://github.com/haokexin/linux > > Thanks Kevin, > > I was working through it as well. I did a quick check, and most of the > resolutions looked ok. > > There may be some differences, if i broke a branch you are watching, > let me know.
I diffed the final merge between yours and mine and found some issues. I have sent out addon patches to fix them [1] [2] [3] [4]. Please help me merge them. [1] https://lists.yoctoproject.org/g/linux-yocto/message/12920 [2] https://lists.yoctoproject.org/g/linux-yocto/message/12921 [3] https://lists.yoctoproject.org/g/linux-yocto/message/12922 [4] https://lists.yoctoproject.org/g/linux-yocto/message/12923 Thanks, Kevin > > Bruce > > > > > 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
signature.asc
Description: PGP signature
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12924): https://lists.yoctoproject.org/g/linux-yocto/message/12924 Mute This Topic: https://lists.yoctoproject.org/mt/100526999/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
