In message: Trial merge of v5.15.167 v6.1.110 v6.1.111 v6.6.51 v6.6.52 for linux-yocto on 20/09/2024 Kevin Hao wrote:
> Hi Bruce, > > This is a trial merge of the stable kernel v5.15.167 v6.1.110 v6.1.111 > v6.6.51 v6.6.52 for the following branches in the linux-yocto. > 2a6fedef6c69 v5.15/standard/sdkv5.10/axxia > db8b3a6098f2 v5.15/standard/preempt-rt/sdkv5.10/axxia > c3cab9e45416 v5.15/standard/base > 6f4ca7b79e2a v5.15/standard/preempt-rt/base > f68803fe3176 v5.15/standard/cn-sdkv5.4/octeon > c8758bbf632b v5.15/standard/preempt-rt/cn-sdkv5.4/octeon > 0eb5fc496c2e v5.15/standard/cn-sdkv5.15/octeon > eb8f356ca1ad v5.15/standard/preempt-rt/cn-sdkv5.15/octeon > 6ead991c2124 v5.15/standard/ti-sdk-5.10/ti-j72xx > #Have textual conflicts > 2cc24240de4b v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx > #Have textual conflicts > dc92a4794dd5 v5.15/standard/nxp-sdk-5.15/nxp-soc > fb85c0de20a2 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc > 80e9776d4086 v5.15/standard/bcm-2xxx-rpi > 3f3211f643e0 v5.15/standard/preempt-rt/bcm-2xxx-rpi > 276b294ec408 v5.15/standard/nxp-sdk-5.15/nxp-s32g > 18ad9875c902 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > ab2af68ef8db v5.15/standard/intel-sdk-5.15/intel-socfpga > 7ebb98c1e99f v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga > b7d39c42865c v5.15/standard/x86 > #Have textual conflicts > f8532f3bb021 v5.15/standard/preempt-rt/x86 > #Have textual conflicts > 24b198f96eb3 v5.15/standard/sdkv5.15/xlnx-soc > #Have textual conflicts > d8fea47ea15e v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc > #Have textual conflicts > 7f012baa5674 v6.1/standard/sdkv5.10/axxia > 5ee155dd6e56 v6.1/standard/preempt-rt/sdkv5.10/axxia > cea7ebd049db v6.1/standard/base > f3a510bbd92d v6.1/standard/preempt-rt/base > e1f3bb5f318f v6.1/standard/ti-sdk-6.1/ti-j7xxx > #Have textual conflicts > fe5ce20c70b9 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx > #Have textual conflicts > 6a4692b81684 v6.1/standard/nxp-sdk-6.1/nxp-soc > 4317b512a445 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc > 121e6117e5e6 v6.1/standard/cn-sdkv5.15/octeon > #Have textual conflicts > d2ebed3084cf v6.1/standard/preempt-rt/cn-sdkv5.15/octeon > #Have textual conflicts > 32135a4155fa v6.1/standard/cn-sdkv6.1/octeon > #Have textual conflicts > b7416e689eb4 v6.1/standard/preempt-rt/cn-sdkv6.1/octeon > #Have textual conflicts > a2c10d4be3e9 v6.1/standard/microchip-polarfire-soc > 8a8db3f1f088 v6.1/standard/preempt-rt/microchip-polarfire-soc > beee45e01360 v6.1/standard/bcm-2xxx-rpi > 3bf1f426a956 v6.1/standard/preempt-rt/bcm-2xxx-rpi > 62677e295253 v6.1/standard/nxp-sdk-5.15/nxp-s32g > c16051ba25e0 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > a64519f53166 v6.1/standard/intel-sdk-6.1/intel-socfpga > 05acffa82845 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga > cd0eb37d1d81 v6.1/standard/x86 > eebf500d15f9 v6.1/standard/preempt-rt/x86 > dfe75847a1e2 v6.1/standard/sdkv6.1/xlnx-soc > #Have textual conflicts > 4222409143f9 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc > #Have textual conflicts > 4a20d583d7da v6.6/standard/sdkv5.15/axxia > e55b1b90b9af v6.6/standard/preempt-rt/sdkv5.15/axxia > 2f4aeb5257f5 v6.6/standard/base > 87cdacf086c6 v6.6/standard/preempt-rt/base > 6ddc7210df43 v6.6/standard/nxp-sdk-6.6/nxp-soc > #Have textual and semantic conflicts > 5ad01f827e8c v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc > #Have textual and semantic conflicts > b7de8dc3b8c1 v6.6/standard/cn-sdkv6.1/octeon > #Have textual conflicts > f5862dade425 v6.6/standard/preempt-rt/cn-sdkv6.1/octeon > #Have textual conflicts > e5de31791a4d v6.6/standard/microchip-polarfire-soc > d5f27778bc98 v6.6/standard/preempt-rt/microchip-polarfire-soc > 112983b96072 v6.6/standard/bcm-2xxx-rpi > #Have textual conflicts > 5c0213e02353 v6.6/standard/preempt-rt/bcm-2xxx-rpi > #Have textual conflicts > e4ab77b852a1 v6.6/standard/nxp-sdk-6.6/nxp-s32g > #Have textual conflicts > 31ac44376af9 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g > #Have textual conflicts > fff6179e326c v6.6/standard/intel-sdk-6.6/intel-socfpga > ae172ff41839 v6.6/standard/preempt-rt/intel-sdk-6.6/intel-socfpga > 3a660f1ad5b6 v6.6/standard/ti-sdk-6.6/ti-soc > #Have textual conflicts > f887d9eb9eec v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc > #Have textual conflicts > 69c8f9342728 v6.6/standard/sdkv6.6/xlnx-soc > #Have textual conflicts > 18adb8c0a613 v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc > #Have textual conflicts > > There are some merge conflicts in every kernel version, and special attention > > should be given to: > - The semantic conflicts in v6.6 nxp branches. > - The nasty conflicts in v6.1&v6.6 octeon and xilinx branches. > > All the branches have passed my build test. I have pushed all these branches > to: > https://github.com/haokexin/linux Thanks Kevin, I've completed my -stable updates, but since I've been traveling for the last week, I won't be pushing any updates until Monday (As I'm returning and won't be around to fix any issues that may pop up.) Bruce > > 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 (#14406): https://lists.yoctoproject.org/g/linux-yocto/message/14406 Mute This Topic: https://lists.yoctoproject.org/mt/108555470/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
