Hi Bruce, This is a trial merge of the stable kernel v6.1.78 for the following branches in the linux-yocto. 4f1a9f1d7ee4 v6.1/standard/sdkv5.10/axxia 9c240941be25 v6.1/standard/preempt-rt/sdkv5.10/axxia 284ad4cc497a v6.1/standard/base ac08ae673eb8 v6.1/standard/preempt-rt/base 49fa58442c36 v6.1/standard/ti-sdk-6.1/ti-j7xxx f131b3f2d86f v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx d592fc45305e v6.1/standard/nxp-sdk-6.1/nxp-soc 113120ee8b76 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc a79dec938604 v6.1/standard/cn-sdkv5.15/octeon #Have textual conflicts 056fea746238 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon #Have textual conflicts 8d297159e73b v6.1/standard/microchip-polarfire-soc c3cdf8200811 v6.1/standard/preempt-rt/microchip-polarfire-soc a6842b90fdbb v6.1/standard/bcm-2xxx-rpi #Have textual conflicts b8a179d3a20f v6.1/standard/preempt-rt/bcm-2xxx-rpi #Have textual conflicts 7e2b6bac5eed v6.1/standard/nxp-sdk-5.15/nxp-s32g 4e3f041b683a v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g a3658b463d96 v6.1/standard/intel-sdk-6.1/intel-socfpga c130c0e67c2d v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga 0306c2edcebb v6.1/standard/x86 aa46592399f6 v6.1/standard/preempt-rt/x86 4fc1f88fc0ab v6.1/standard/sdkv6.1/xlnx-soc #Have textual conflicts 14eef2874abd v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc #Have textual conflicts
There are only three minor merge conflicts in this stable upgrade. 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 (#13579): https://lists.yoctoproject.org/g/linux-yocto/message/13579 Mute This Topic: https://lists.yoctoproject.org/mt/104422683/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-