In message: Trial merge of v6.6.76 v6.6.77 for linux-yocto on 12/02/2025 Kevin Hao wrote:
> Hi Bruce, > > This is a trial merge of the stable kernel v6.6.76 v6.6.77 for the following > branches in the linux-yocto. > 0f711efb089c v6.6/standard/sdkv5.15/axxia > f933f51ca5fd v6.6/standard/preempt-rt/sdkv5.15/axxia > #Have textual conflicts > 1e6a97bba52a v6.6/standard/base > 0cd0bd05c836 v6.6/standard/preempt-rt/base > #Have textual conflicts > 34e8b0531024 v6.6/standard/nxp-sdk-6.6/nxp-soc > #Have textual and semantic conflicts > ca74b7920f4c v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc > #Have textual and semantic conflicts > f06cc8c7b0f8 v6.6/standard/cn-sdkv6.1/octeon > 6859c329fa31 v6.6/standard/preempt-rt/cn-sdkv6.1/octeon > #Have textual conflicts > ed7348e24600 v6.6/standard/microchip-polarfire-soc > #Have textual and semantic conflicts > 3011856ebc8a v6.6/standard/preempt-rt/microchip-polarfire-soc > #Have textual and semantic conflicts > 82e8fb8a0f9e v6.6/standard/bcm-2xxx-rpi > #Have textual conflicts > 7a1bc3e28f30 v6.6/standard/preempt-rt/bcm-2xxx-rpi > #Have textual conflicts > 2e24528d431e v6.6/standard/nxp-sdk-6.6/nxp-s32g > 9a817b8036ea v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g > #Have textual conflicts > 90e1cf37fdf9 v6.6/standard/intel-sdk-6.6/intel-socfpga > #Have textual conflicts > 3afcddc52ff0 v6.6/standard/preempt-rt/intel-sdk-6.6/intel-socfpga > #Have textual conflicts > 702527a87c3d v6.6/standard/ti-sdk-6.6/ti-soc > #Have textual conflicts > 0d0d97bebe91 v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc > #Have textual conflicts > 330f3ccd446d v6.6/standard/x86 > 79230a5503d3 v6.6/standard/preempt-rt/x86 > #Have textual conflicts > 7bed06eba170 v6.6/standard/sdkv6.6/xlnx-soc > #Have semantic conflicts > 6a48d28a43a1 v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc > #Have textual and semantic conflicts > > There are numerous merge conflicts in this v6.6 stable kernel update. While > some > are minor, the following significant ones require special attention: > > - A minor conflict exists in the 8250 driver across all the rt branches. > > - The conflicts in pci-imx6.c within the nxp branches are particularly > challenging. > We need to adjust multiple SDK codes to ensure compatibility with the clock > changes > introduced in the stable kernel. > > - A semantic conflict has arisen in the polarfire branches due to a lock name > change. > > - Another semantic conflict occurs in clk-si5324.c in xilinx branches, caused > by the > API change of of_property_for_each_u32 macro. > > All branches have passed my build tests, and I have pushed them to: > https://github.com/haokexin/linux Thanks Kevin, I've done the same bumps locally and pushed the changes to git.yoctoproject.org 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 (#14785): https://lists.yoctoproject.org/g/linux-yocto/message/14785 Mute This Topic: https://lists.yoctoproject.org/mt/111135412/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
