On Mon, Jul 24, 2023 at 02:40:14PM +0800, Kevin Hao wrote: > Hi Bruce, > > This is a trial merge of the stable kernel v5.15.121, v6.1.40 for the > following branches in the linux-yocto. > d217e2a854d4 v5.15/standard/sdkv5.10/axxia > 87668f21cf3e v5.15/standard/preempt-rt/sdkv5.10/axxia > 741b4b2f75d6 v5.15/standard/base > 0671c2b097f9 v5.15/standard/preempt-rt/base > 72c068afdef2 v5.15/standard/cn-sdkv5.4/octeon > #Have textual conflicts > e3a5409014fb v5.15/standard/preempt-rt/cn-sdkv5.4/octeon > #Have textual conflicts > 6cc0329067f5 v5.15/standard/cn-sdkv5.15/octeon > #Have textual conflicts > c9aa67382434 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon > #Have textual conflicts > f5c196cb149b v5.15/standard/ti-sdk-5.10/ti-j72xx > 61b8153246cc v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx > 081ba450a5a2 v5.15/standard/nxp-sdk-5.15/nxp-soc > #Have textual conflicts > 00f727cbeb8a v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc > #Have textual conflicts > 6067ef73583d v5.15/standard/bcm-2xxx-rpi > #Have textual conflicts > c5ca3432b058 v5.15/standard/preempt-rt/bcm-2xxx-rpi > 3f236de14502 v5.15/standard/nxp-sdk-5.15/nxp-s32g > #Have textual conflicts > 01da3ce9a9fb v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > #Have textual conflicts > 03cfbfd82626 v5.15/standard/intel-sdk-5.15/intel-socfpga > b5d7406d5892 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga > a6ecf7bf4884 v5.15/standard/x86 > 7b7760412f79 v5.15/standard/preempt-rt/x86 > 1c0fa8eb75b0 v5.15/standard/sdkv5.15/xlnx-soc > #Have textual conflicts > 484ec5d4b1c1 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc > #Have textual conflicts > 9733c76a8307 v6.1/standard/base > d97848ab180d v6.1/standard/preempt-rt/base > e59d16ddff6b v6.1/standard/ti-sdk-6.1/ti-j7xxx > 0d1f76818198 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx > bc6b53464601 v6.1/standard/nxp-sdk-6.1/nxp-soc > #Have textual conflicts > 712a6a169928 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc > #Have textual conflicts > a7d3b18a0d38 v6.1/standard/cn-sdkv5.15/octeon > #Have textual conflicts > 827e3f24f17d v6.1/standard/preempt-rt/cn-sdkv5.15/octeon > #Have textual conflicts > bc11dde7a1fe v6.1/standard/bcm-2xxx-rpi > #Have textual conflicts > 462713ae74c6 v6.1/standard/preempt-rt/bcm-2xxx-rpi > #Have textual conflicts > b4a1da61cd40 v6.1/standard/nxp-sdk-5.15/nxp-s32g > ae88d9a5dcdb v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > f669476e795a v6.1/standard/intel-sdk-6.1/intel-socfpga > 0ed4e1ad0eb9 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga > af0f4c06ac02 v6.1/standard/x86 > 3121b4220b87 v6.1/standard/preempt-rt/x86 > 3682b3ab6a66 v6.1/standard/sdkv6.1/xlnx-soc > bfb26786826e v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
It seems that several my resolution for the merge conflicts didn't propagate to your final merge. I have sent 3 addon patches [1] [2] [3] to fix them. [1] https://lists.yoctoproject.org/g/linux-yocto/message/12896 [2] https://lists.yoctoproject.org/g/linux-yocto/message/12897 [3] https://lists.yoctoproject.org/g/linux-yocto/message/12898 Thanks, Kevin > > The v5.15.121 is another significant release, comprising 532 patches. While > it does > introduce a substantial number of merge conflicts, most of them appear to be > quite > trivial. The merge of v6.1.40 is built upon the merge of v6.1.39, which I > previously > sent out. In comparison to the v6.1.39, the merge of v6.1.40 is much simpler. > 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
signature.asc
Description: PGP signature
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12899): https://lists.yoctoproject.org/g/linux-yocto/message/12899 Mute This Topic: https://lists.yoctoproject.org/mt/100324448/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
