Hi Bruce, This is a trial merge of the stable kernel v6.6.78 for the following branches in the linux-yocto. 356187e94f6c v6.6/standard/sdkv5.15/axxia 346274b164f7 v6.6/standard/preempt-rt/sdkv5.15/axxia #Have textual conflicts 1b7debf1a00d v6.6/standard/base aa4d79540956 v6.6/standard/preempt-rt/base #Have textual conflicts 3c3841b92def v6.6/standard/nxp-sdk-6.6/nxp-soc #Have textual conflicts 8f8dcb1880ee v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc #Have textual conflicts c7db63ece6c3 v6.6/standard/cn-sdkv6.1/octeon ce93ad6e295a v6.6/standard/preempt-rt/cn-sdkv6.1/octeon #Have textual conflicts f86756d1bdea v6.6/standard/microchip-polarfire-soc db8261bddcc9 v6.6/standard/preempt-rt/microchip-polarfire-soc #Have textual conflicts cc88fbf7dfaf v6.6/standard/bcm-2xxx-rpi 78587c927380 v6.6/standard/preempt-rt/bcm-2xxx-rpi #Have textual conflicts bd6e04e9241f v6.6/standard/nxp-sdk-6.6/nxp-s32g 4402e152116f v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g #Have textual conflicts 626e04a37708 v6.6/standard/intel-sdk-6.6/intel-socfpga 450910010fcf v6.6/standard/preempt-rt/intel-sdk-6.6/intel-socfpga #Have textual conflicts e9ce67b10edf v6.6/standard/ti-sdk-6.6/ti-soc 04298ec82ea9 v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc #Have textual conflicts 9cc1925d7762 v6.6/standard/x86 cab8f94ad2eb v6.6/standard/preempt-rt/x86 #Have textual conflicts ff19b2dcea19 v6.6/standard/sdkv6.6/xlnx-soc f31a37b236c7 v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc #Have textual conflicts
There are two minor merge conflicts: - One occurs in the drivers/tty/serial/xilinx_uartps.c across all rt branches. - The other is in the drivers/gpu/drm/rockchip/cdn-dp-core.c on nxp branches. All branches have passed my build tests, and I have pushed them 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 (#14786): https://lists.yoctoproject.org/g/linux-yocto/message/14786 Mute This Topic: https://lists.yoctoproject.org/mt/111244884/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-