On Fri, May 19, 2023 at 02:06:11PM -0400, Bruce Ashfield wrote: > In message: Trial merge of v5.15.112 v6.1.29 for linux-yocto > on 19/05/2023 Kevin Hao wrote: > > > Hi Bruce, > > > > This is a trial merge of the stable kernel v5.15.112 v6.1.29 for the > > following branches in the linux-yocto. > > 4f69e62a898e v5.15/standard/sdkv5.10/axxia > > 5e9f5f2c4644 v5.15/standard/preempt-rt/sdkv5.10/axxia > > 71fbcf542eb0 v5.15/standard/base > > 8cc51cef6e43 v5.15/standard/preempt-rt/base > > 7fb9db009bab v5.15/standard/cn-sdkv5.4/octeon > > #Have conflicts > > 6e8af66a5288 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon > > #Have conflicts > > d51906e23096 v5.15/standard/cn-sdkv5.15/octeon > > #Have conflicts > > 94f80c91824d v5.15/standard/preempt-rt/cn-sdkv5.15/octeon > > #Have conflicts > > 86dd0aa1ec93 v5.15/standard/ti-sdk-5.10/ti-j72xx > > 933a97c39de5 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx > > 35a6b8339fda v5.15/standard/nxp-sdk-5.15/nxp-soc > > #Have build failures > > 79b8dab0213e v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc > > #Have build failures > > 6cb6a1855bf0 v5.15/standard/bcm-2xxx-rpi > > e8360b4682fa v5.15/standard/preempt-rt/bcm-2xxx-rpi > > 9e22e6dec2c5 v5.15/standard/nxp-sdk-5.15/nxp-s32g > > 1e0524a9af85 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > > 072e2eb2f121 v5.15/standard/intel-sdk-5.15/intel-socfpga > > a13bdea5a83b v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga > > eab5d9d1ed28 v5.15/standard/x86 > > bab100cd18c5 v5.15/standard/preempt-rt/x86 > > d0a39f7d545f v5.15/standard/sdkv5.15/xlnx-soc > > 633b3d197247 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc > > 7f828d7462d0 v6.1/standard/base > > 566c13db6587 v6.1/standard/preempt-rt/base > > 114fd6056886 v6.1/standard/ti-sdk-5.10/ti-j7xxx > > #Have build failures > > 724c950a302b v6.1/standard/preempt-rt/ti-sdk-5.10/ti-j7xxx > > #Have build failures > > 84716ffc22da v6.1/standard/nxp-sdk-6.1/nxp-soc > > d67776245fb5 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc > > 28ccefe2813a v6.1/standard/bcm-2xxx-rpi > > 490bee698190 v6.1/standard/preempt-rt/bcm-2xxx-rpi > > b12458371f8f v6.1/standard/nxp-sdk-5.15/nxp-s32g > > f1d552417a73 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > > 7f828d7462d0 v6.1/standard/x86 > > c9faca3acc07 v6.1/standard/preempt-rt/x86 > > f36e9c7d39b8 v6.1/standard/sdkv6.1/xlnx-soc > > #Have conflicts and build failures > > a7a4865e7e7d v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc > > #Have conflicts and build failures > > > > According to the quantity of patches (134 in v5.15.112 and 239 in v6.1.29), > > this seems a regular release. > > But the merge conflicts and build failures are more than I have expected. I > > have folded the fix into > > the corresponding merge commit. There is also a fix [1] for the ti-j7xxx on > > the v6.1 kernel, it has nothing > > to do with this stable update and is just bug exposed by my build script. > > All these 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, > > I used some of the build failures fixes while completing the merges > here. > > Everything is now pushed to linux-yocto.
It seems that two fixes for the semantic merge conflicts are missed in the final branches, I have sent two addon patches [1] [2] for them. [1] https://lists.yoctoproject.org/g/linux-yocto/message/12632 [2] https://lists.yoctoproject.org/g/linux-yocto/message/12633 Thanks, Kevin > > Bruce > > > > > [1] https://lists.yoctoproject.org/g/linux-yocto/message/12626 > > > > Thanks, > > Kevin
signature.asc
Description: PGP signature
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12634): https://lists.yoctoproject.org/g/linux-yocto/message/12634 Mute This Topic: https://lists.yoctoproject.org/mt/99003148/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
