In message: Trial merge of v6.1.112 v6.6.53 v6.6.54 for linux-yocto on 06/10/2024 Kevin Hao wrote:
> Hi Bruce, > > This is a trial merge of the stable kernel v6.1.112 v6.6.53 v6.6.54 for the > following branches in the linux-yocto. > ed6399b8f657 v6.1/standard/sdkv5.10/axxia > 631ecafbf70b v6.1/standard/preempt-rt/sdkv5.10/axxia > 3cab394b3647 v6.1/standard/base > 534ad9d3b656 v6.1/standard/preempt-rt/base > e81dffd52ae9 v6.1/standard/ti-sdk-6.1/ti-j7xxx > b01a9e374c1b v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx > 1c6e82fab359 v6.1/standard/nxp-sdk-6.1/nxp-soc > fe51716fad71 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc > d37fc3e5646a v6.1/standard/cn-sdkv5.15/octeon > e9ce5f8d1c91 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon > 5966ad8853d1 v6.1/standard/cn-sdkv6.1/octeon > a67165e870bd v6.1/standard/preempt-rt/cn-sdkv6.1/octeon > 8d42d4417204 v6.1/standard/microchip-polarfire-soc > 8217c52bdb9f v6.1/standard/preempt-rt/microchip-polarfire-soc > bdb66f4414d4 v6.1/standard/bcm-2xxx-rpi > 0ceb11e2e38f v6.1/standard/preempt-rt/bcm-2xxx-rpi > 95fa0a6242ea v6.1/standard/nxp-sdk-5.15/nxp-s32g > 8bdc17bec673 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > 7364e658130c v6.1/standard/intel-sdk-6.1/intel-socfpga > 5e0500b1123a v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga > 691928b8fafc v6.1/standard/x86 > e71066e36783 v6.1/standard/preempt-rt/x86 > 6ccfd23d1afa v6.1/standard/sdkv6.1/xlnx-soc > 2f047ab4b09c v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc > 00e905b9ddcd v6.6/standard/sdkv5.15/axxia > dfee74e8a859 v6.6/standard/preempt-rt/sdkv5.15/axxia > 1afb6139cc63 v6.6/standard/base > 6f58eb8e4a59 v6.6/standard/preempt-rt/base > a948a34977c3 v6.6/standard/nxp-sdk-6.6/nxp-soc > #Have textual and semantic conflicts > a91e7c207e7e v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc > #Have textual and semantic conflicts > b47f683c816e v6.6/standard/cn-sdkv6.1/octeon > 75a5df4a41a5 v6.6/standard/preempt-rt/cn-sdkv6.1/octeon > 0a6a84a0193d v6.6/standard/microchip-polarfire-soc > #Have textual conflicts > 035e629729d3 v6.6/standard/preempt-rt/microchip-polarfire-soc > #Have textual conflicts > 692b737a8692 v6.6/standard/bcm-2xxx-rpi > 617ac40d363a v6.6/standard/preempt-rt/bcm-2xxx-rpi > 9358be58c53e v6.6/standard/nxp-sdk-6.6/nxp-s32g > 22bcf2dfdd7d v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g > 89b7471f3605 v6.6/standard/intel-sdk-6.6/intel-socfpga > #Have textual conflicts > 9aa3ec53c934 v6.6/standard/preempt-rt/intel-sdk-6.6/intel-socfpga > #Have textual conflicts > 2b033b9b6a7a v6.6/standard/ti-sdk-6.6/ti-soc > c5f8407f5acf v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc > 7df103d0f07a v6.6/standard/sdkv6.6/xlnx-soc > #Have textual and semantic conflicts > 9226097d6405 v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc > #Have textual and semantic conflicts > > There are some conflicts in the merging of v6.6.54, and special attention > should be given to the nxp and xilinx branches. All the branches have passed > my build test. I have pushed all these branches to: > https://github.com/haokexin/linux Now that I have 6.12 up and running, I'm back to -stable. I've done my updates for these branches, and didn't see anything signficant different in mine versus yours. If something strange has gone on let me know and I'll fix it (I'm still not convinced I've fixed all the issues with aborted and manually fixed up merges). 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 (#14440): https://lists.yoctoproject.org/g/linux-yocto/message/14440 Mute This Topic: https://lists.yoctoproject.org/mt/108844925/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
