In message: Trial merge of v6.12.63 for linux-yocto on 19/12/2025 Kevin Hao wrote:
> Hi Bruce, > > This is a trial merge of the stable kernel v6.12.63 for the following > branches in the linux-yocto. > fc88c38d49c2 20251219/v6.12/standard/base > 369b8c6f231e 20251219/v6.12/standard/preempt-rt/base > f953a19e4e75 20251219/v6.12/standard/nvidia-sdk-5.15/nvidia-soc > 73a904210087 20251219/v6.12/standard/preempt-rt/nvidia-sdk-5.15/nvidia-soc > a9282254a3d2 20251219/v6.12/standard/nxp-sdk-6.12/nxp-soc > #Have textual conflicts > bdb9a889d624 20251219/v6.12/standard/preempt-rt/nxp-sdk-6.12/nxp-soc > #Have textual conflicts > 7df0dd30f159 20251219/v6.12/standard/octeon > 3c69592d0786 20251219/v6.12/standard/preempt-rt/octeon > 5b186ce347de 20251219/v6.12/standard/bcm-2xxx-rpi > ed17c42e2793 20251219/v6.12/standard/preempt-rt/bcm-2xxx-rpi > c13954fe5f5d 20251219/v6.12/standard/nxp-sdk-6.6/nxp-s32g > 3d37cb1ceaf5 20251219/v6.12/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g > 6885b3258e72 20251219/v6.12/standard/intel-socfpga > #Have textual conflicts > 2d2f83ee169b 20251219/v6.12/standard/preempt-rt/intel-socfpga > #Have textual conflicts > 8da4777584ee 20251219/v6.12/standard/ti-soc > d41df04c20b5 20251219/v6.12/standard/preempt-rt/ti-soc > 7bd9ddc4a0e2 20251219/v6.12/standard/x86 > debb8ce9fffc 20251219/v6.12/standard/preempt-rt/x86 > 475c807df9ed 20251219/v6.12/standard/xlnx-soc > 3534f38cccbb 20251219/v6.12/standard/preempt-rt/xlnx-soc > > There are only a few minor conflicts across the nxp and socfpga branches. > The resolutions are consistent: to adopt the changes from the stable kernel. Thanks Kevin. I've done the same merges here. I probably won't do any more -stable merges until after the new year at this point, unless I get some extra time when out of the office. Happy New Year. 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 (#16088): https://lists.yoctoproject.org/g/linux-yocto/message/16088 Mute This Topic: https://lists.yoctoproject.org/mt/116857725/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
