In message: Trial merge of v5.15.199 v6.1.162 v6.12.69 v6.6.123 for linux-yocto
on 07/02/2026 Kevin Hao wrote:
> Hi Bruce,
>
> This is a trial merge of the stable kernel v5.15.199 v6.1.162 v6.12.69
> v6.6.123 for the following branches in the linux-yocto.
> effd39f568f8 20260207/v5.15/standard/sdkv5.10/axxia
> 1782b5c8883a 20260207/v5.15/standard/preempt-rt/sdkv5.10/axxia
> 4e24563a448f 20260207/v5.15/standard/base
> b998e4bd72ce 20260207/v5.15/standard/preempt-rt/base
> c2787b9d1549 20260207/v5.15/standard/cn-sdkv5.4/octeon
> #Have textual conflicts
> 92a9e4c5a764 20260207/v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
> #Have textual conflicts
> 6993501f7bca 20260207/v5.15/standard/cn-sdkv5.15/octeon
> #Have textual conflicts
> c38cd326f1f9 20260207/v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
> #Have textual conflicts
> b068ea4dd659 20260207/v5.15/standard/cn-sdk-12.25.02-6/octeon
> #Have textual conflicts
> 76c509219508 20260207/v5.15/standard/preempt-rt/cn-sdk-12.25.02-6/octeon
> #Have textual conflicts
> 01e6d0323e58 20260207/v5.15/standard/ti-sdk-5.10/ti-j72xx
> f13c6cc5b542 20260207/v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
> 96b83ccc92e0 20260207/v5.15/standard/nxp-sdk-5.15/nxp-soc
> 1eed7928e3db 20260207/v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
> 8daf3773cff5 20260207/v5.15/standard/nvidia-orin
> d87ee5c26e35 20260207/v5.15/standard/preempt-rt/nvidia-orin
> 80f82a38127e 20260207/v5.15/standard/bcm-2xxx-rpi
> a22632cd422b 20260207/v5.15/standard/preempt-rt/bcm-2xxx-rpi
> b6bb9f6f60aa 20260207/v5.15/standard/nxp-sdk-5.15/nxp-s32g
> 48a23edf5ed8 20260207/v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
> 5d47692969c1 20260207/v5.15/standard/nxp-sdk-5.10/nxp-s32g
> 3566d9a2fb60 20260207/v5.15/standard/preempt-rt/nxp-sdk-5.10/nxp-s32g
> 7b9738c69c6f 20260207/v5.15/standard/intel-sdk-5.15/intel-socfpga
> c8f2ee663e28
> 20260207/v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
> 87f08a6f146e 20260207/v5.15/standard/x86
> #Have textual conflicts
> 34495cba9020 20260207/v5.15/standard/preempt-rt/x86
> #Have textual conflicts
> 66130ff8d857 20260207/v5.15/standard/sdkv5.15/xlnx-soc
> 7cce4b936c1c 20260207/v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
> 81c6018066fa 20260207/v6.1/standard/sdkv5.10/axxia
> 7209da745d11 20260207/v6.1/standard/preempt-rt/sdkv5.10/axxia
> b15ea51c0408 20260207/v6.1/standard/base
> 3b41d7f6c263 20260207/v6.1/standard/preempt-rt/base
> 115110b82351 20260207/v6.1/standard/ti-sdk-6.1/ti-j7xxx
> 9b2e1d233e63 20260207/v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
> 727e9cb18943 20260207/v6.1/standard/ti-sdk-5.10/ti-j7xxx
> 887e95629c7a 20260207/v6.1/standard/preempt-rt/ti-sdk-5.10/ti-j7xxx
> 5c13c85c2544 20260207/v6.1/standard/nxp-sdk-6.1/nxp-soc
> #Have textual conflicts
> 4e49538e4f79 20260207/v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
> #Have textual conflicts
> 2a10244861c8 20260207/v6.1/standard/cn-sdkv5.15/octeon
> #Have textual conflicts
> f36850218cb9 20260207/v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
> #Have textual conflicts
> 0871bdcb0e92 20260207/v6.1/standard/cn-sdkv6.1/octeon
> #Have textual conflicts
> 7f3d0aae0fde 20260207/v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
> #Have textual conflicts
My scripts showed quite a fairly large delta between the branches after
I fixed up the conflicts from your resolution. But rather than revert
something that I don't remember merging to the branches, I left the delta
(with just the conflicts resolved). Have a look at let me know if I
should have taken more changes from your branch.
> 07bfc68a017e 20260207/v6.1/standard/microchip-polarfire-soc
> 18d7af00a579 20260207/v6.1/standard/preempt-rt/microchip-polarfire-soc
> 3cc3104346fb 20260207/v6.1/standard/bcm-2xxx-rpi
> fa380753b74a 20260207/v6.1/standard/preempt-rt/bcm-2xxx-rpi
> a70775f369ad 20260207/v6.1/standard/nxp-sdk-5.15/nxp-s32g
> 58a3e7a365b5 20260207/v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
> 4fa195b061d1 20260207/v6.1/standard/intel-sdk-6.1/intel-socfpga
> f90f7f18b5bb 20260207/v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
> 7f47c3ea8458 20260207/v6.1/standard/x86
> 5e4cdce3855f 20260207/v6.1/standard/preempt-rt/x86
> 64d6852aad6a 20260207/v6.1/standard/sdkv6.1/xlnx-soc
> 57f42c51a589 20260207/v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
> 302bbc9e78ee 20260207/v6.12/standard/base
> 7cf0b92afb65 20260207/v6.12/standard/preempt-rt/base
> 1795c170b3e7 20260207/v6.12/standard/nvidia-sdk-5.15/nvidia-soc
> 6e792b0f1fb8 20260207/v6.12/standard/preempt-rt/nvidia-sdk-5.15/nvidia-soc
> 7d66f786eea8 20260207/v6.12/standard/nxp-sdk-6.12/nxp-soc
> 94c202bc3803 20260207/v6.12/standard/preempt-rt/nxp-sdk-6.12/nxp-soc
> 99638fbf9b12 20260207/v6.12/standard/octeon
> d43cb90b28b4 20260207/v6.12/standard/preempt-rt/octeon
> 8834438c6362 20260207/v6.12/standard/bcm-2xxx-rpi
> 3eba09cc252c 20260207/v6.12/standard/preempt-rt/bcm-2xxx-rpi
> 855dcf81e479 20260207/v6.12/standard/nxp-sdk-6.6/nxp-s32g
> 5974826957be 20260207/v6.12/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
> 78bf64f90320 20260207/v6.12/standard/intel-socfpga
> 62dbdda41274 20260207/v6.12/standard/preempt-rt/intel-socfpga
> 45de7974d8a3 20260207/v6.12/standard/ti-soc
> bd342019d2fd 20260207/v6.12/standard/preempt-rt/ti-soc
> 0379dc5f2363 20260207/v6.12/standard/x86
> 7f80a8821db2 20260207/v6.12/standard/preempt-rt/x86
> ebaa1bdac12e 20260207/v6.12/standard/xlnx-soc
> 64f6995a3d8a 20260207/v6.12/standard/preempt-rt/xlnx-soc
> 9e641f8d6a91 20260207/v6.6/standard/sdkv5.15/axxia
> 83267f5668f4 20260207/v6.6/standard/preempt-rt/sdkv5.15/axxia
> #Have textual conflicts
> c6b67053d94b 20260207/v6.6/standard/base
> 61ac1d0778a1 20260207/v6.6/standard/preempt-rt/base
> #Have textual conflicts
> ad50642171cc 20260207/v6.6/standard/nxp-sdk-6.6/nxp-soc
> 5f4aa5496703 20260207/v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
> #Have textual conflicts
> b81ac6df91b0 20260207/v6.6/standard/cn-sdkv6.1/octeon
> a87dc546f0a8 20260207/v6.6/standard/preempt-rt/cn-sdkv6.1/octeon
> #Have textual conflicts
> 444d96f4d793 20260207/v6.6/standard/cn-sdkv6.6/octeon
> 46ca6270b8c0 20260207/v6.6/standard/preempt-rt/cn-sdkv6.6/octeon
> #Have textual conflicts
> 0d746fe73e92 20260207/v6.6/standard/nvidia-orin
> d83165263754 20260207/v6.6/standard/preempt-rt/nvidia-orin
> #Have textual conflicts
> 981ee259ca15 20260207/v6.6/standard/microchip-polarfire-soc
> aa4d0dc8fd99 20260207/v6.6/standard/preempt-rt/microchip-polarfire-soc
> #Have textual conflicts
> 0ee4cda227b4 20260207/v6.6/standard/bcm-2xxx-rpi
> febc8a587463 20260207/v6.6/standard/preempt-rt/bcm-2xxx-rpi
> #Have textual conflicts
> 5db350d51a1b 20260207/v6.6/standard/nxp-sdk-6.6/nxp-s32g
> 108ee91dd1df 20260207/v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
> #Have textual conflicts
> 51cec34867bd 20260207/v6.6/standard/intel-sdk-6.6/intel-socfpga
> 241971620e98 20260207/v6.6/standard/preempt-rt/intel-sdk-6.6/intel-socfpga
> #Have textual conflicts
> bf18aeaa01f1 20260207/v6.6/standard/ti-sdk-6.6/ti-soc
> 9441792ffb94 20260207/v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc
> #Have textual conflicts
> f291cc660cda 20260207/v6.6/standard/x86
> 45f74dd18556 20260207/v6.6/standard/preempt-rt/x86
> #Have textual conflicts
> f788ad764975 20260207/v6.6/standard/sdkv6.6/xlnx-soc
> b89c63fb936f 20260207/v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc
> #Have textual conflicts
>
> In this stable update cycle, the majority of merge conflicts are occurring on
> the
> Marvell octeon and v6.6 rt branches.
>
> - v5.15 and v6.1 octeon branches:
> When addressing the conflicts introduced by stable commit 4c811259d84d
> ("octeontx2-af:
> Fix error handling"), we must also update the goto labels for the code
> segments added
> by the SDK commits.
>
>
> - v6.6 rt branches:
> The stable commits:
> 5a530c8ead06 ("Revert "net: Remove conditional threaded-NAPI wakeup based
> on task state."")
> 507692c05636 ("Revert "net: Allow to use SMP threads for backlog NAPI.")
>
> conflict with the rt patch:
> 884ef10937f0 ("net: Avoid the IPI to free the")
>
> This explains why the conflict appears across all v6.6 rt branches. The
> resolution
> is straightforward.
>
> 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.
Nothing else jumped out as a problem during my updates, but
as usual, let me know if something looks wrong.
Bruce
>
> Thanks,
> Kevin
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#16294):
https://lists.yoctoproject.org/g/linux-yocto/message/16294
Mute This Topic: https://lists.yoctoproject.org/mt/117686681/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
