Hi Bruce,
This is a trial merge of the stable kernel v6.12.58 for the following branches
in the linux-yocto.
48acfe95c7f9 20251114/v6.12/standard/base
9c835123db9e 20251114/v6.12/standard/preempt-rt/base
f29b919f5380 20251114/v6.12/standard/nvidia-sdk-5.15/nvidia-soc
b7726a641bee 20251114/v6.12/standard/preempt-rt/nvidia-sdk-5.15/nvidia-soc
8795f4ef26a6 20251114/v6.12/standard/nxp-sdk-6.12/nxp-soc
#Have textual conflicts
5a6973e017d5 20251114/v6.12/standard/preempt-rt/nxp-sdk-6.12/nxp-soc
#Have textual conflicts
29c322729827 20251114/v6.12/standard/octeon
4cb15f28d1ee 20251114/v6.12/standard/preempt-rt/octeon
1890fe2774c7 20251114/v6.12/standard/bcm-2xxx-rpi
#Have textual conflicts
03b441d7ff8f 20251114/v6.12/standard/preempt-rt/bcm-2xxx-rpi
#Have textual conflicts
7c40545daf0c 20251114/v6.12/standard/nxp-sdk-6.6/nxp-s32g
#Have textual conflicts
180440374860 20251114/v6.12/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
#Have textual conflicts
a7e0b97b595e 20251114/v6.12/standard/intel-socfpga
#Have textual conflicts
8e5b603bde52 20251114/v6.12/standard/preempt-rt/intel-socfpga
#Have textual conflicts
e291a9584bf1 20251114/v6.12/standard/ti-soc
#Have textual conflicts
caec51cac315 20251114/v6.12/standard/preempt-rt/ti-soc
#Have textual conflicts
b5f3b4f5137b 20251114/v6.12/standard/x86
cceb3314efa6 20251114/v6.12/standard/preempt-rt/x86
bac05f17121a 20251114/v6.12/standard/xlnx-soc
a1fea05e5045 20251114/v6.12/standard/preempt-rt/xlnx-soc
In addition to a few minor merge conflicts across several branches, the merge
conflicts in `drivers/clocksource/timer-vf-pit.c` on the s32g branches are
particularly problematic. However, the resolution is straightforward: we simply
need to discard the stable changes and retain the SDK modifications.
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 (#15982):
https://lists.yoctoproject.org/g/linux-yocto/message/15982
Mute This Topic: https://lists.yoctoproject.org/mt/116288737/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
