Re: [linux-yocto] Trial merge of v5.15.111 v6.1.28 for linux-yocto
On Mon, May 15, 2023 at 10:50:11PM -0400, Bruce Ashfield wrote: > The BSP resolutions are definitely helpful. I'm still perfecting > the workflow (and my scripts) to reference the changes more easily, Please feel free to let me know if you want me to adjust my workflow or the content of my email. Thanks, Kevin signature.asc Description: PGP signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12557): https://lists.yoctoproject.org/g/linux-yocto/message/12557 Mute This Topic: https://lists.yoctoproject.org/mt/98841823/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto] Trial merge of v5.15.111 v6.1.28 for linux-yocto
In message: Trial merge of v5.15.111 v6.1.28 for linux-yocto on 12/05/2023 Kevin Hao wrote: > Hi Bruce, > > This is a trial merge of the stable kernel v5.15.111 v6.1.28 for the > following branches in the linux-yocto. > 443f96dec14c v5.15/standard/sdkv5.10/axxia > 541ee58e54e0 v5.15/standard/preempt-rt/sdkv5.10/axxia >#Have conflicts > 508a4e703a79 v5.15/standard/base > 168834cde529 v5.15/standard/preempt-rt/base >#Have conflicts > 7f137c507774 v5.15/standard/cn-sdkv5.4/octeon > b491324b85ba v5.15/standard/preempt-rt/cn-sdkv5.4/octeon >#Have conflicts > 2dd232ba6ce7 v5.15/standard/cn-sdkv5.15/octeon > fd6c28f7b390 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon >#Have conflicts > 76ae3a0f2a73 v5.15/standard/ti-sdk-5.10/ti-j72xx >#Have conflicts > 9119f3f87a61 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx >#Have conflicts > 26cdaccd602c v5.15/standard/nxp-sdk-5.15/nxp-soc > f127c78e0cf0 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc >#Have conflicts > 7eee2cb35e49 v5.15/standard/bcm-2xxx-rpi > a842cf4e4675 v5.15/standard/preempt-rt/bcm-2xxx-rpi >#Have conflicts > 51149dacd7c4 v5.15/standard/nxp-sdk-5.15/nxp-s32g > f36ddc08df68 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g >#Have conflicts > fbb655cba3b2 v5.15/standard/intel-sdk-5.15/intel-socfpga > c421ea83b1ba v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga >#Have conflicts > 8f23e04e29ba v5.15/standard/x86 > 95d135df2110 v5.15/standard/preempt-rt/x86 >#Have conflicts > 5492ac82859e v5.15/standard/sdkv5.15/xlnx-soc >#Have conflicts > 4dd6efc6a43b v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc >#Have conflicts > 3caa8770fbc2 v6.1/standard/base > 8886ff2350fe v6.1/standard/preempt-rt/base > fe915ec2426e v6.1/standard/nxp-sdk-6.1/nxp-soc >#Have conflicts > 79624711ef7d v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc >#Have conflicts > f9964998b8ea v6.1/standard/bcm-2xxx-rpi >#Have conflicts > f6916595380e v6.1/standard/preempt-rt/bcm-2xxx-rpi >#Have conflicts > a536e2acc87b v6.1/standard/nxp-sdk-5.15/nxp-s32g > b0c530beaf73 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > 3caa8770fbc2 v6.1/standard/x86 > 4e11d1d2ffce v6.1/standard/preempt-rt/x86 > 8fbef12438f5 v6.1/standard/sdkv6.1/xlnx-soc >#Have conflicts > 7f80b171fa27 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc >#Have conflicts > > This is a much bigger stable cycle. There are 372 patches in v5.15.111 and > 611 patches in v6.1.28. > So we got more merge conflicts than usual. There is one merge conflict in > kernel/workqueue.c on > v5.15 rt kernel, all the others are for various drivers. I believe I have > fixed all the mess and > all the merges have passed my build test. I have pushed 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 did reference the changes in quite a few occasions, and also cross referenced against upstream -rt for the workqueue issue. The BSP resolutions are definitely helpful. I'm still perfecting the workflow (and my scripts) to reference the changes more easily, so hopefully relatively few issues crept into my merges. Bruce > > Thanks, > Kevin -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12552): https://lists.yoctoproject.org/g/linux-yocto/message/12552 Mute This Topic: https://lists.yoctoproject.org/mt/98841823/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] -=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto] Trial merge of v5.15.111 v6.1.28 for linux-yocto
[[linux-yocto] Trial merge of v5.15.111 v6.1.28 for linux-yocto] On 12/05/2023 (Fri 10:19) Kevin Hao via lists.yoctoproject.org wrote: > Hi Bruce, > > This is a trial merge of the stable kernel v5.15.111 v6.1.28 for the > following branches in the linux-yocto. [...] > This is a much bigger stable cycle. There are 372 patches in v5.15.111 and > 611 patches in v6.1.28. That is a lot of conflicts. I hope most were semi-trivial. Sure would be nice if the stable cycles had the smaller footprint they had 10y ago. > So we got more merge conflicts than usual. There is one merge conflict in > kernel/workqueue.c on > v5.15 rt kernel, all the others are for various drivers. I believe I have > fixed all the mess and > all the merges have passed my build test. I have pushed these branches to: > https://github.com/haokexin/linux Thanks for helping out and doing this non-trivial amount of work. Paul. -- > > You can use this as a reference for the linux-yocto stable kernel bump. > > Thanks, > Kevin > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12498): https://lists.yoctoproject.org/g/linux-yocto/message/12498 Mute This Topic: https://lists.yoctoproject.org/mt/98841823/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] Trial merge of v5.15.111 v6.1.28 for linux-yocto
Hi Bruce, This is a trial merge of the stable kernel v5.15.111 v6.1.28 for the following branches in the linux-yocto. 443f96dec14c v5.15/standard/sdkv5.10/axxia 541ee58e54e0 v5.15/standard/preempt-rt/sdkv5.10/axxia #Have conflicts 508a4e703a79 v5.15/standard/base 168834cde529 v5.15/standard/preempt-rt/base #Have conflicts 7f137c507774 v5.15/standard/cn-sdkv5.4/octeon b491324b85ba v5.15/standard/preempt-rt/cn-sdkv5.4/octeon #Have conflicts 2dd232ba6ce7 v5.15/standard/cn-sdkv5.15/octeon fd6c28f7b390 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon #Have conflicts 76ae3a0f2a73 v5.15/standard/ti-sdk-5.10/ti-j72xx #Have conflicts 9119f3f87a61 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx #Have conflicts 26cdaccd602c v5.15/standard/nxp-sdk-5.15/nxp-soc f127c78e0cf0 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc #Have conflicts 7eee2cb35e49 v5.15/standard/bcm-2xxx-rpi a842cf4e4675 v5.15/standard/preempt-rt/bcm-2xxx-rpi #Have conflicts 51149dacd7c4 v5.15/standard/nxp-sdk-5.15/nxp-s32g f36ddc08df68 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g #Have conflicts fbb655cba3b2 v5.15/standard/intel-sdk-5.15/intel-socfpga c421ea83b1ba v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga #Have conflicts 8f23e04e29ba v5.15/standard/x86 95d135df2110 v5.15/standard/preempt-rt/x86 #Have conflicts 5492ac82859e v5.15/standard/sdkv5.15/xlnx-soc #Have conflicts 4dd6efc6a43b v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc #Have conflicts 3caa8770fbc2 v6.1/standard/base 8886ff2350fe v6.1/standard/preempt-rt/base fe915ec2426e v6.1/standard/nxp-sdk-6.1/nxp-soc #Have conflicts 79624711ef7d v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc #Have conflicts f9964998b8ea v6.1/standard/bcm-2xxx-rpi #Have conflicts f6916595380e v6.1/standard/preempt-rt/bcm-2xxx-rpi #Have conflicts a536e2acc87b v6.1/standard/nxp-sdk-5.15/nxp-s32g b0c530beaf73 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 3caa8770fbc2 v6.1/standard/x86 4e11d1d2ffce v6.1/standard/preempt-rt/x86 8fbef12438f5 v6.1/standard/sdkv6.1/xlnx-soc #Have conflicts 7f80b171fa27 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc #Have conflicts This is a much bigger stable cycle. There are 372 patches in v5.15.111 and 611 patches in v6.1.28. So we got more merge conflicts than usual. There is one merge conflict in kernel/workqueue.c on v5.15 rt kernel, all the others are for various drivers. I believe I have fixed all the mess and all the merges have passed my build test. I have pushed these branches to: https://github.com/haokexin/linux You can use this as a reference for the linux-yocto stable kernel bump. Thanks, Kevin -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12497): https://lists.yoctoproject.org/g/linux-yocto/message/12497 Mute This Topic: https://lists.yoctoproject.org/mt/98841823/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
