In message: Trial merge of v5.15.150 v6.1.80 for linux-yocto on 03/03/2024 Kevin Hao wrote:
> Hi Bruce, > > This is a trial merge of the stable kernel v5.15.150 v6.1.80 for the > following branches in the linux-yocto. > d9a206b1e8df v5.15/standard/sdkv5.10/axxia > 3bbed27ea98f v5.15/standard/preempt-rt/sdkv5.10/axxia > #Have textual conflicts > 752c3e846500 v5.15/standard/base > 3f49b5be9cba v5.15/standard/preempt-rt/base > #Have textual conflicts > 425734836965 v5.15/standard/cn-sdkv5.4/octeon > 5be9989451a2 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon > #Have textual conflicts > cc60f6c04e80 v5.15/standard/cn-sdkv5.15/octeon > 03b9f468bbfe v5.15/standard/preempt-rt/cn-sdkv5.15/octeon > #Have textual conflicts > 1d17c450e7c3 v5.15/standard/ti-sdk-5.10/ti-j72xx > #Have textual and semantic conflicts > c74b348d3c61 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx > #Have textual and semantic conflicts > 3ccdf70d6b5c v5.15/standard/nxp-sdk-5.15/nxp-soc > #Have textual and semantic conflicts > d29770d57084 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc > #Have textual and semantic conflicts > 65c708ad07d3 v5.15/standard/bcm-2xxx-rpi > 0b634ca1bd0c v5.15/standard/preempt-rt/bcm-2xxx-rpi > #Have textual conflicts > cb9e06f1dd89 v5.15/standard/nxp-sdk-5.15/nxp-s32g > d76af205a2e0 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > #Have textual conflicts > 9f35e45e6281 v5.15/standard/intel-sdk-5.15/intel-socfpga > 3812e745cb9c v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga > #Have textual conflicts > 4727f1ce38e7 v5.15/standard/x86 > 6cff9592620e v5.15/standard/preempt-rt/x86 > #Have textual conflicts > 292ca55e586f v5.15/standard/sdkv5.15/xlnx-soc > b0b07bbe4563 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc > #Have textual conflicts > af9b32221d22 v6.1/standard/sdkv5.10/axxia > d5bf56c5c30d v6.1/standard/preempt-rt/sdkv5.10/axxia > 683d2bdef569 v6.1/standard/base > 719ccc67eab1 v6.1/standard/preempt-rt/base > f741f03eb7c8 v6.1/standard/ti-sdk-6.1/ti-j7xxx > b6d9019e97ae v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx > 1f54279de788 v6.1/standard/nxp-sdk-6.1/nxp-soc > 6fb6123f6a66 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc > 3cba2b869c7b v6.1/standard/cn-sdkv5.15/octeon > 99d04ec1f9ee v6.1/standard/preempt-rt/cn-sdkv5.15/octeon > c61c3cfea7c0 v6.1/standard/microchip-polarfire-soc > 9ba5ac081a0e v6.1/standard/preempt-rt/microchip-polarfire-soc > 9485c4c0a4f8 v6.1/standard/bcm-2xxx-rpi > a027bbc9d627 v6.1/standard/preempt-rt/bcm-2xxx-rpi > 26319da5f7b0 v6.1/standard/nxp-sdk-5.15/nxp-s32g > fe8e5e4a31b0 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > 2373dd6c6afa v6.1/standard/intel-sdk-6.1/intel-socfpga > 76c2aaacb279 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga > 7a0feae8c015 v6.1/standard/x86 > 87517b2082b6 v6.1/standard/preempt-rt/x86 > 4816a8036a15 v6.1/standard/sdkv6.1/xlnx-soc > 3cad170dacd5 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc > > All the merge conflicts are from v5.15 kernel: > - All the v5.15 rt branches incur a merge conflict due to the removing of the > following two files in stable kernel: > net/sched/sch_atm.c > net/sched/sch_cbq.c > > - There is a semantic conflict in v5.15 j72xx branch, we would have to add an > additional 'goto of_node_put;' due to the SDK changes. > > - There is a semantic conflict in v5.15 nxp branch, we would have to keep the > original arguments for input_set_abs_params(). Thanks Kevin! I've done similar merges here, send follow ups if something is wrong. On the tjxx BSPs, I had a bit of a strange merge with the dtb script, so it may have issues. Bruce > > 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
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13624): https://lists.yoctoproject.org/g/linux-yocto/message/13624 Mute This Topic: https://lists.yoctoproject.org/mt/104697174/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
