In message: Trial merge of v5.15.172 v6.1.117 v6.6.61 for linux-yocto on 17/11/2024 Kevin Hao wrote:
> Hi Bruce, > > This is a trial merge of the stable kernel v5.15.172 v6.1.117 v6.6.61 for the > following branches in the linux-yocto. > c850322779fc v5.15/standard/sdkv5.10/axxia > ddf2ac995b2c v5.15/standard/preempt-rt/sdkv5.10/axxia > 6f1d692fb373 v5.15/standard/base > 2ed6ee574cf6 v5.15/standard/preempt-rt/base > 00fc438110ff v5.15/standard/cn-sdkv5.4/octeon > c800ba1b4cde v5.15/standard/preempt-rt/cn-sdkv5.4/octeon > 78ce27ed3417 v5.15/standard/cn-sdkv5.15/octeon > 7864616b533e v5.15/standard/preempt-rt/cn-sdkv5.15/octeon > 465b1bf9b480 v5.15/standard/ti-sdk-5.10/ti-j72xx > cf31669174a6 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx > b8b43ece7d92 v5.15/standard/nxp-sdk-5.15/nxp-soc > e0f53e67a9b8 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc > e6b80adb2c87 v5.15/standard/bcm-2xxx-rpi > fd0bac699445 v5.15/standard/preempt-rt/bcm-2xxx-rpi > c8068b61987e v5.15/standard/nxp-sdk-5.15/nxp-s32g > a979fbea86e6 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > 5d0283ed19b8 v5.15/standard/intel-sdk-5.15/intel-socfpga > 1f271a2faa2c v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga > 3eca76c6df77 v5.15/standard/x86 > #Have textual conflicts > 1cf20fc712fc v5.15/standard/preempt-rt/x86 > #Have textual conflicts > fc7100f59472 v5.15/standard/sdkv5.15/xlnx-soc > #Have textual conflicts > 92d8eb0b8509 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc > #Have textual conflicts > 421bbde212bf v6.1/standard/sdkv5.10/axxia > d320858055e9 v6.1/standard/preempt-rt/sdkv5.10/axxia > 7488d4dd0edb v6.1/standard/base > 71f09aa9ee13 v6.1/standard/preempt-rt/base > 9e6650e51892 v6.1/standard/ti-sdk-6.1/ti-j7xxx > e278af53054f v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx > b5f2ab41e6e1 v6.1/standard/nxp-sdk-6.1/nxp-soc > #Have textual conflicts > a0137b650854 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc > #Have textual conflicts > 1e7f3334050d v6.1/standard/cn-sdkv5.15/octeon > 8bb071c74463 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon > 0d3a9b29aaf7 v6.1/standard/cn-sdkv6.1/octeon > d819e16ff27d v6.1/standard/preempt-rt/cn-sdkv6.1/octeon > 2798ca4a7f11 v6.1/standard/microchip-polarfire-soc > 18c46c57a9e7 v6.1/standard/preempt-rt/microchip-polarfire-soc > 061c5c18b5be v6.1/standard/bcm-2xxx-rpi > 8718335e22e8 v6.1/standard/preempt-rt/bcm-2xxx-rpi > 81a30454d6b8 v6.1/standard/nxp-sdk-5.15/nxp-s32g > 664d91153da1 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > d019caaabcf7 v6.1/standard/intel-sdk-6.1/intel-socfpga > 923b06c0e37b v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga > f60f907e9d38 v6.1/standard/x86 > 96ca698f2e20 v6.1/standard/preempt-rt/x86 > 8e5b6acf0459 v6.1/standard/sdkv6.1/xlnx-soc > #Have textual conflicts > 3b3627a39513 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc > #Have textual conflicts > da249e55bf67 v6.6/standard/sdkv5.15/axxia > 5e127c3b203a v6.6/standard/preempt-rt/sdkv5.15/axxia > 609dbc968f08 v6.6/standard/base > e23dc2d90fd5 v6.6/standard/preempt-rt/base > a583e401b4ba v6.6/standard/nxp-sdk-6.6/nxp-soc > #Have textual conflicts > af8605ea1716 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc > #Have textual conflicts > e7720a4d6673 v6.6/standard/cn-sdkv6.1/octeon > c66f729d4e5e v6.6/standard/preempt-rt/cn-sdkv6.1/octeon > 8cc92ba76dca v6.6/standard/microchip-polarfire-soc > 67e8b756d8d8 v6.6/standard/preempt-rt/microchip-polarfire-soc > 2f3b5bceee8f v6.6/standard/bcm-2xxx-rpi > #Have textual conflicts > 36ff6b528b70 v6.6/standard/preempt-rt/bcm-2xxx-rpi > #Have textual conflicts > 40a1973115db v6.6/standard/nxp-sdk-6.6/nxp-s32g > 9cd01aee8aa6 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g > d6de8c1eaeb8 v6.6/standard/intel-sdk-6.6/intel-socfpga > dc63bc9345b4 v6.6/standard/preempt-rt/intel-sdk-6.6/intel-socfpga > 1cdf7ab23f82 v6.6/standard/ti-sdk-6.6/ti-soc > d9d6fb9c5299 v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc > e228051c43bd v6.6/standard/sdkv6.6/xlnx-soc > #Have textual conflicts > b5ac366dd693 v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc > #Have textual conflicts > > There are only a few minor conflicts in these stable updates. The only > conflict > requiring special attention is in the v6.6 nxp branch. Due to code > refactoring, > we need to apply the stable changes for enetc_sriov_configure() in > drivers/net/ethernet/freescale/enetc/enetc_pf_common.c. All branches have > passed > my build tests, and I have pushed them to: > https://github.com/haokexin/linux I've done the same merges here. There was a bit of git history getting tangled with the small -stable that just came out. I had to back a change out and manually compare. I think the nxp branches are correct, but I'm not setup to build them, so if you can double check and send fixups, that would be amazing. 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 (#14589): https://lists.yoctoproject.org/g/linux-yocto/message/14589 Mute This Topic: https://lists.yoctoproject.org/mt/109624430/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
