Hi Bruce,
This is a trial merge of the stable kernel v6.12.62 for the following branches
in the linux-yocto.
d8b5572e17e1 20251213/v6.12/standard/base
8e83a6359c02 20251213/v6.12/standard/preempt-rt/base
4471042f03a0 20251213/v6.12/standard/nvidia-sdk-5.15/nvidia-soc
43dd3d241f01 20251213/v6.12/standard/preempt-rt/nvidia-sdk-5.15/nvidia-soc
1df8d2f0a19f 20251213/v6.12/standard/nxp-sdk-6.12/nxp-soc
#Have textual conflicts
eb3867060609 20251213/v6.12/standard/preempt-rt/nxp-sdk-6.12/nxp-soc
#Have textual conflicts
238e6d891707 20251213/v6.12/standard/octeon
7382b792a5fb 20251213/v6.12/standard/preempt-rt/octeon
826fc1501757 20251213/v6.12/standard/bcm-2xxx-rpi
fad9a2fd66ee 20251213/v6.12/standard/preempt-rt/bcm-2xxx-rpi
24f4b0ba3986 20251213/v6.12/standard/nxp-sdk-6.6/nxp-s32g
7f0d390741d4 20251213/v6.12/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
6981e0bc0c97 20251213/v6.12/standard/intel-socfpga
87bebda18450 20251213/v6.12/standard/preempt-rt/intel-socfpga
d4e26044d179 20251213/v6.12/standard/ti-soc
c91ff735f371 20251213/v6.12/standard/preempt-rt/ti-soc
467753bccdb1 20251213/v6.12/standard/x86
871f424e3534 20251213/v6.12/standard/preempt-rt/x86
a902325a9255 20251213/v6.12/standard/xlnx-soc
#Have textual conflicts
d7656f4471f8 20251213/v6.12/standard/preempt-rt/xlnx-soc
#Have textual conflicts
There are only two conflicts in the nxp and xilinx branches, respectively,
and both resolutions are the same: to retain the changes from the BSP 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 (#16050):
https://lists.yoctoproject.org/g/linux-yocto/message/16050
Mute This Topic: https://lists.yoctoproject.org/mt/116759893/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
