In message: Trial merge of v5.15.198 v6.1.161 v6.12.66 v6.6.121 for linux-yocto
on 20/01/2026 Kevin Hao wrote:
> Hi Bruce,
>
> This is a trial merge of the stable kernel v5.15.198 v6.1.161 v6.12.66
> v6.6.121 for the following branches in the linux-yocto.
> 0ff05451b13b 20260120/v5.15/standard/sdkv5.10/axxia
> 4b52b4c36377 20260120/v5.15/standard/preempt-rt/sdkv5.10/axxia
> 56fa8cc7d09e 20260120/v5.15/standard/base
> 3ec70712b438 20260120/v5.15/standard/preempt-rt/base
> 796c98f6845f 20260120/v5.15/standard/cn-sdkv5.4/octeon
> 87859639e4c6 20260120/v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
> 6e8255770cfb 20260120/v5.15/standard/cn-sdkv5.15/octeon
> b31ecc3b236b 20260120/v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
> 50433ac5b97a 20260120/v5.15/standard/cn-sdk-12.25.02-6/octeon
> 2c281df5fbcb 20260120/v5.15/standard/preempt-rt/cn-sdk-12.25.02-6/octeon
> be1094d55283 20260120/v5.15/standard/ti-sdk-5.10/ti-j72xx
> #Have textual conflicts
> a6ae00803039 20260120/v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
> #Have textual conflicts
> dfd7d0443cd0 20260120/v5.15/standard/nxp-sdk-5.15/nxp-soc
> #Have textual conflicts
> 753d7143d158 20260120/v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
> #Have textual conflicts
> e135d1f5ff8f 20260120/v5.15/standard/nvidia-orin
> #Have textual conflicts
> 46f9a05465bf 20260120/v5.15/standard/preempt-rt/nvidia-orin
> #Have textual conflicts
> 2a966cee4388 20260120/v5.15/standard/bcm-2xxx-rpi
> 140770a140b8 20260120/v5.15/standard/preempt-rt/bcm-2xxx-rpi
> a9c463b4877b 20260120/v5.15/standard/nxp-sdk-5.15/nxp-s32g
> #Have textual conflicts
> da8bec941077 20260120/v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
> #Have textual conflicts
> 67135caf327b 20260120/v5.15/standard/nxp-sdk-5.10/nxp-s32g
> #Have textual conflicts
> cf095a28ba93 20260120/v5.15/standard/preempt-rt/nxp-sdk-5.10/nxp-s32g
> #Have textual conflicts
> 278cdb86107a 20260120/v5.15/standard/intel-sdk-5.15/intel-socfpga
> 347ad6059d28
> 20260120/v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
> 9417e6050f94 20260120/v5.15/standard/x86
> 8e67e7e1088b 20260120/v5.15/standard/preempt-rt/x86
> 71acb5383506 20260120/v5.15/standard/sdkv5.15/xlnx-soc
> #Have textual conflicts
> 849565508cdb 20260120/v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
> #Have textual conflicts
> 9cf4aae1cb14 20260120/v6.1/standard/sdkv5.10/axxia
> 0e13cea4ea66 20260120/v6.1/standard/preempt-rt/sdkv5.10/axxia
> aabc918b3ca1 20260120/v6.1/standard/base
> 997fdc9eff56 20260120/v6.1/standard/preempt-rt/base
> e6e85ad1a5e8 20260120/v6.1/standard/ti-sdk-6.1/ti-j7xxx
> dfe59ff1fad5 20260120/v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
> 919de1a8d3b0 20260120/v6.1/standard/ti-sdk-5.10/ti-j7xxx
> #Have textual conflicts
> 7c1dfa6cd63c 20260120/v6.1/standard/preempt-rt/ti-sdk-5.10/ti-j7xxx
> #Have textual conflicts
> 9e6e2bc29aa7 20260120/v6.1/standard/nxp-sdk-6.1/nxp-soc
> 577ed69036a3 20260120/v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
> 541d18422f2b 20260120/v6.1/standard/cn-sdkv5.15/octeon
> 77c6f95d93bd 20260120/v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
> 9b753bb74bfd 20260120/v6.1/standard/cn-sdkv6.1/octeon
> a19f7882ac1d 20260120/v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
> b02ffec30edf 20260120/v6.1/standard/microchip-polarfire-soc
> 6903aaa09b4d 20260120/v6.1/standard/preempt-rt/microchip-polarfire-soc
> dbfbbba5b3db 20260120/v6.1/standard/bcm-2xxx-rpi
> 9c3bc5bc2dfc 20260120/v6.1/standard/preempt-rt/bcm-2xxx-rpi
> 6b501d3ee0f7 20260120/v6.1/standard/nxp-sdk-5.15/nxp-s32g
> 2011728a4edc 20260120/v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
> e6c3595c12b9 20260120/v6.1/standard/intel-sdk-6.1/intel-socfpga
> e4b143a9e799 20260120/v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
> 3d65912f9c55 20260120/v6.1/standard/x86
> 231ffc6bd8f8 20260120/v6.1/standard/preempt-rt/x86
> 2fe8d71a127a 20260120/v6.1/standard/sdkv6.1/xlnx-soc
> 3bf54dba880c 20260120/v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
> 795a428cceee 20260120/v6.12/standard/base
> f597f6197d7f 20260120/v6.12/standard/preempt-rt/base
> b27d62fd42e5 20260120/v6.12/standard/nvidia-sdk-5.15/nvidia-soc
> 186361ed6ac5 20260120/v6.12/standard/preempt-rt/nvidia-sdk-5.15/nvidia-soc
> c2dc06830771 20260120/v6.12/standard/nxp-sdk-6.12/nxp-soc
> #Have textual conflicts
> 02c263e11361 20260120/v6.12/standard/preempt-rt/nxp-sdk-6.12/nxp-soc
> #Have textual conflicts
> c56afd178d3f 20260120/v6.12/standard/octeon
> 5ad00a8ef0c3 20260120/v6.12/standard/preempt-rt/octeon
> 35dd7ab27e46 20260120/v6.12/standard/bcm-2xxx-rpi
> e9bcad1190cd 20260120/v6.12/standard/preempt-rt/bcm-2xxx-rpi
> c2838ab8b123 20260120/v6.12/standard/nxp-sdk-6.6/nxp-s32g
> a7ae2dac593b 20260120/v6.12/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
> 6210a221a53e 20260120/v6.12/standard/intel-socfpga
> c11cbdbdf727 20260120/v6.12/standard/preempt-rt/intel-socfpga
> 626696bd89f2 20260120/v6.12/standard/ti-soc
> #Have textual conflicts
> 37c936362e8c 20260120/v6.12/standard/preempt-rt/ti-soc
> #Have textual conflicts
> a2bb52c87a49 20260120/v6.12/standard/x86
> da4b9f9407cb 20260120/v6.12/standard/preempt-rt/x86
> f11feb86e0b5 20260120/v6.12/standard/xlnx-soc
> #Have textual conflicts
> df37dc9a84d7 20260120/v6.12/standard/preempt-rt/xlnx-soc
> #Have textual conflicts
> 52cde1eedb6d 20260120/v6.6/standard/sdkv5.15/axxia
> 506b626fcab6 20260120/v6.6/standard/preempt-rt/sdkv5.15/axxia
> 662afc9722c9 20260120/v6.6/standard/base
> c79ee8ce8cbc 20260120/v6.6/standard/preempt-rt/base
> e61c8d2bbc89 20260120/v6.6/standard/nxp-sdk-6.6/nxp-soc
> #Have textual conflicts
> d231ef84427b 20260120/v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
> #Have textual conflicts
> 2cfcf393f471 20260120/v6.6/standard/cn-sdkv6.1/octeon
> 2b5218df5b1b 20260120/v6.6/standard/preempt-rt/cn-sdkv6.1/octeon
> 7693a2898de6 20260120/v6.6/standard/cn-sdkv6.6/octeon
> 7e56a76cd425 20260120/v6.6/standard/preempt-rt/cn-sdkv6.6/octeon
> 1e2290272d9c 20260120/v6.6/standard/nvidia-orin
> 35361d2cb2b4 20260120/v6.6/standard/preempt-rt/nvidia-orin
> 3c2d19f314dd 20260120/v6.6/standard/microchip-polarfire-soc
> f757b7cbcf1f 20260120/v6.6/standard/preempt-rt/microchip-polarfire-soc
> 20b4401ab131 20260120/v6.6/standard/bcm-2xxx-rpi
> e45aef8bd237 20260120/v6.6/standard/preempt-rt/bcm-2xxx-rpi
> 131271f37d95 20260120/v6.6/standard/nxp-sdk-6.6/nxp-s32g
> 3f496311ce3d 20260120/v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
> 983468fef2c8 20260120/v6.6/standard/intel-sdk-6.6/intel-socfpga
> b7c8ffcb587a 20260120/v6.6/standard/preempt-rt/intel-sdk-6.6/intel-socfpga
> 396cdd609071 20260120/v6.6/standard/ti-sdk-6.6/ti-soc
> c1104337c6c5 20260120/v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc
> 4569dc596778 20260120/v6.6/standard/x86
> 8b1b35e978f8 20260120/v6.6/standard/preempt-rt/x86
> c7e793516ba2 20260120/v6.6/standard/sdkv6.6/xlnx-soc
> 0dee88df345a 20260120/v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc
>
> The majority of merge conflicts originate from the v5.15 and v6.12 kernels.
> The following ones require additional attention:
>
> - For v5.15 nxp branches:
> Since the definition of struct fsl_xcvr_soc_data has been moved to
> fsl_xcvr.h
> in the SDK commit, we must also apply the changes from stable commit
> 650127b100b1
> ("ASoC: fsl_xcvr: Add support for i.MX93 platform") to fsl_xcvr.h.
>
> - For v5.15 orin branches:
> There are numerous conflicting changes in the
> drivers/spi/spi-tegra210-quad.c file.
> This situation arises because some similar patches have been applied to
> both the
> SDK and stable kernel, while other patches are entirely different between
> the two.
> In certain cases, we must adopt the code from the SDK commit, whereas in
> others,
> we should select the changes from the stable commit.
Thanks Kevin.
I've done the same merges, and also updated v5.10 for anyone that is
still using it.
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 (#16191):
https://lists.yoctoproject.org/g/linux-yocto/message/16191
Mute This Topic: https://lists.yoctoproject.org/mt/117362096/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
