Thanks Kevin, You'll see that i pushed preliminary merges of multiple different kernels.
I haven't officially released them, since not only am I doing the -stable kernels right now, I'm releasing the 6.6-dev kernel and creating a 6.5 reference kernel for the release. As such, my builders are quite busy. If anything is wrong, send patches to the list. Bruce On Sun, Sep 24, 2023 at 10:11 PM Kevin Hao <haoke...@gmail.com> wrote: > On Sun, Sep 24, 2023 at 08:11:06PM -0400, Bruce Ashfield wrote: > > > > > > On Sun, Sep 24, 2023 at 8:03 AM Kevin Hao <haoke...@gmail.com> wrote: > > > > Hi Bruce, > > > > This is a trial merge of the stable kernel v5.15.130 ~ v5.15.133, > v6.1.54 ~ > > v6.1.55 for the following branches in the linux-yocto. > > 8cfb633ece36 v5.15/standard/sdkv5.10/axxia > > 66c1afbe8592 v5.15/standard/preempt-rt/sdkv5.10/axxia > > > #Have textual conflicts > > b25ae6f98132 v5.15/standard/base > > > #Have textual conflicts > > fd20b091de24 v5.15/standard/preempt-rt/base > > > #Have textual conflicts > > 9b02967a1b96 v5.15/standard/cn-sdkv5.4/octeon > > b5b871e65bac v5.15/standard/preempt-rt/cn-sdkv5.4/octeon > > > #Have textual conflicts > > 6afe3ea510ce v5.15/standard/cn-sdkv5.15/octeon > > a911f8ac50d6 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon > > > #Have textual conflicts > > 5582c40b8c48 v5.15/standard/ti-sdk-5.10/ti-j72xx > > 5d97485e7e15 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx > > > #Have textual conflicts > > 8a35ffabf373 v5.15/standard/nxp-sdk-5.15/nxp-soc > > > #Have textual conflicts > > 62a2940c1774 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc > > > #Have textual conflicts > > e2062f2334f0 v5.15/standard/bcm-2xxx-rpi > > d96f37d876cd v5.15/standard/preempt-rt/bcm-2xxx-rpi > > > #Have textual conflicts > > ff73c1dcbbde v5.15/standard/nxp-sdk-5.15/nxp-s32g > > 68042104bf74 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > > > #Have textual conflicts > > 7280c94be8ef v5.15/standard/intel-sdk-5.15/intel-socfpga > > 2aabc091d9bf > v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga > > #Have textual conflicts > > a35913f85c91 v5.15/standard/x86 > > fd2a242f62ed v5.15/standard/preempt-rt/x86 > > > #Have textual conflicts > > ed8f4b0781f4 v5.15/standard/sdkv5.15/xlnx-soc > > 23bdefd715c3 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc > > > #Have textual conflicts > > 6f2152aeeb93 v6.1/standard/base > > 9770d8771298 v6.1/standard/preempt-rt/base > > > #Have textual conflicts > > 7c599eabcd65 v6.1/standard/ti-sdk-6.1/ti-j7xxx > > 99a8b2db5187 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx > > > #Have textual conflicts > > 24ed16cd5006 v6.1/standard/nxp-sdk-6.1/nxp-soc > > > #Have textual conflicts > > 676a6c51ec64 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc > > > #Have textual conflicts > > b57c43abdfc0 v6.1/standard/cn-sdkv5.15/octeon > > 0c2d6f0dfa0e v6.1/standard/preempt-rt/cn-sdkv5.15/octeon > > > #Have textual conflicts > > dfb775ddb727 v6.1/standard/bcm-2xxx-rpi > > 05310c5133ea v6.1/standard/preempt-rt/bcm-2xxx-rpi > > > #Have textual conflicts > > b7d3cea79eac v6.1/standard/nxp-sdk-5.15/nxp-s32g > > 9301fa2d3d94 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > > > #Have textual conflicts > > 2fcb348473cd v6.1/standard/intel-sdk-6.1/intel-socfpga > > > #Have textual conflicts > > b4939d4ab8c7 > v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga > > #Have textual conflicts > > e6415ecd6161 v6.1/standard/x86 > > 73b2c2f6a368 v6.1/standard/preempt-rt/x86 > > > #Have textual conflicts > > e3656c41fdfc v6.1/standard/sdkv6.1/xlnx-soc > > > #Have textual conflicts > > a342a1dcf919 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc > > > #Have textual conflicts > > > > There are some merge conflicts in the kernel/printk/printk.c for > both v5.15 > > and > > v6.1 rt kernels, but I used different resolutions for them due to > their > > > > > > printk is a common -rt conflict :) I'll double check the newer -rt > branches as > > well. > > > > I was only looking at the previous -stable merges tonight, are both the > merge > > conflict fixups still there, or did you force push ? > > That depends on if there are any update on the corresponding branches. > If there is no any change since my previous merge, I will reuse the > previous > merge commit. For the branches which merged new patches, I will do a new > merge for each stable release version (of course it will reuse the > recorded resolutions). > > Thanks, > Kevin > > >either way, I plan to jump > > directly to the latest -stable. > > > > Bruce > > > > > > > > rt context difference. Besides that, there are some other merge > conflicts, > > but they aren't too difficult to resolve. 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 > > > -- - 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 (#13124): https://lists.yoctoproject.org/g/linux-yocto/message/13124 Mute This Topic: https://lists.yoctoproject.org/mt/101554334/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] -=-=-=-=-=-=-=-=-=-=-=-
