Hi Bruce, This is a trial merge of the stable kernel v6.1.93 v6.6.33 for the following branches in the linux-yocto. beff341412bb v6.1/standard/sdkv5.10/axxia adf6a319a08c v6.1/standard/preempt-rt/sdkv5.10/axxia 3803209e1cd9 v6.1/standard/base 2dad312fdbf5 v6.1/standard/preempt-rt/base 6d88b8874bf0 v6.1/standard/ti-sdk-6.1/ti-j7xxx #Have textual conflicts f29a19aab881 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx #Have textual conflicts ba9de1b7d853 v6.1/standard/nxp-sdk-6.1/nxp-soc #Have textual and semantic conflicts 95431f33c190 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc #Have textual and semantic conflicts 63086a984030 v6.1/standard/cn-sdkv5.15/octeon d53e77347afe v6.1/standard/preempt-rt/cn-sdkv5.15/octeon 10fca30ab00b v6.1/standard/cn-sdkv6.1/octeon f3a012b2fd20 v6.1/standard/preempt-rt/cn-sdkv6.1/octeon 3a73b0697321 v6.1/standard/microchip-polarfire-soc cb461ec12dba v6.1/standard/preempt-rt/microchip-polarfire-soc 1861207088da v6.1/standard/bcm-2xxx-rpi #Have textual conflicts fee777513ed0 v6.1/standard/preempt-rt/bcm-2xxx-rpi #Have textual conflicts 0d8c1ab921c2 v6.1/standard/nxp-sdk-5.15/nxp-s32g 6248cbcc3128 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 12f3fbda3298 v6.1/standard/intel-sdk-6.1/intel-socfpga 43444c513551 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga 4ad615f21983 v6.1/standard/x86 57384fc3eeaf v6.1/standard/preempt-rt/x86 f9790d19d1df v6.1/standard/sdkv6.1/xlnx-soc 0b10ca9fb92c v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc 12c0e283ba82 v6.6/standard/sdkv5.15/axxia e6b68de08010 v6.6/standard/preempt-rt/sdkv5.15/axxia 6b6c0c35c7d7 v6.6/standard/base 4608bc9beeb6 v6.6/standard/preempt-rt/base 794d9facb23c v6.6/standard/nxp-sdk-6.6/nxp-soc #Have textual conflicts 6b47593fac99 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc #Have textual conflicts d5f1ea0cf46b v6.6/standard/sdkv6.6/xlnx-soc #Have textual conflicts f78a3bb34ec6 v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc #Have textual conflicts
Please note there are some semantic merge conflicts when merging the v6.1 stable into nxp branches. 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 (#14036): https://lists.yoctoproject.org/g/linux-yocto/message/14036 Mute This Topic: https://lists.yoctoproject.org/mt/106653061/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-