In message: Trial merge of v6.12.64 for linux-yocto on 10/01/2026 Kevin Hao wrote:
> Hi Bruce, > > This is a trial merge of the stable kernel v6.12.64 for the following > branches in the linux-yocto. > 2317097b4b7d 20260110/v6.12/standard/base > a277de3238fb 20260110/v6.12/standard/preempt-rt/base > 4d1bb69bb5e6 20260110/v6.12/standard/nvidia-sdk-5.15/nvidia-soc > d6986d6a590e 20260110/v6.12/standard/preempt-rt/nvidia-sdk-5.15/nvidia-soc > 7a582b886b3b 20260110/v6.12/standard/nxp-sdk-6.12/nxp-soc > #Have textual conflicts > ced00d270c45 20260110/v6.12/standard/preempt-rt/nxp-sdk-6.12/nxp-soc > #Have textual conflicts > 5e8c1e791221 20260110/v6.12/standard/octeon > #Have textual conflicts > febfed93475b 20260110/v6.12/standard/preempt-rt/octeon > #Have textual conflicts > afe05d2194a7 20260110/v6.12/standard/bcm-2xxx-rpi > #Have textual conflicts > fa9fc7dfa3bf 20260110/v6.12/standard/preempt-rt/bcm-2xxx-rpi > #Have textual conflicts > 9bfdd8cdf707 20260110/v6.12/standard/nxp-sdk-6.6/nxp-s32g > #Have textual conflicts > 3b5e85565b01 20260110/v6.12/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g > #Have textual conflicts > e230767e646a 20260110/v6.12/standard/intel-socfpga > #Have textual conflicts > f551e134d937 20260110/v6.12/standard/preempt-rt/intel-socfpga > #Have textual conflicts > b0a748139c35 20260110/v6.12/standard/ti-soc > 5bd7382ad8a8 20260110/v6.12/standard/preempt-rt/ti-soc > 892d6dbf0b14 20260110/v6.12/standard/x86 > 9e804ef8bc7f 20260110/v6.12/standard/preempt-rt/x86 > dbdf9149ceb2 20260110/v6.12/standard/xlnx-soc > #Have textual conflicts > 4951fcb8dcbd 20260110/v6.12/standard/preempt-rt/xlnx-soc > #Have textual conflicts > > > The number of patches in this stable update cycle is large, resulting in more > merge > conflicts than usual. > > - For merge conflicts in the nxp branches, the only one requiring special > attention is in > drivers/media/platform/amphion/vpu_malone.c. We need to incorporate the SDK > changes into > the stable modifications within the function vpu_malone_input_frame_data(). > > - There are numerous challenging merge conflicts in > drivers/pci/controller/pcie-brcmstb.c > on the rpi branches. In most cases, I opted to retain the SDK changes and > hope they have > been resolved correctly. > > - When resolving merge conflicts in scripts/Makefile.build on the rpi > branches, we must > remove the unnecessary inclusion of $(srctree)/scripts/Makefile.dtbs. > > - For merge conflicts on the socfpga branches, these arise because the SDK > and stable > versions use two different styles for the same lock (guard(mutex) versus > mutex_lock/unlock()). > To minimize changes, we have chosen to keep the SDK modifications. Thanks Kevin, I did the same merge, and for any of the difficult branches, I diff'd mine against yours. Things came back clean, so there shouldn't be any issues. Bruce > > > 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 (#16174): https://lists.yoctoproject.org/g/linux-yocto/message/16174 Mute This Topic: https://lists.yoctoproject.org/mt/117191344/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
