Hi Bruce,
This is a trial merge of the stable kernel v5.15.200 v6.1.163 v6.12.70 v6.6.124
for the following branches in the linux-yocto.
bfc5369216a9 20260212/v5.15/standard/sdkv5.10/axxia
fb2840c50879 20260212/v5.15/standard/preempt-rt/sdkv5.10/axxia
92ee8e450143 20260212/v5.15/standard/base
76b8de442822 20260212/v5.15/standard/preempt-rt/base
3b1545fb5e7e 20260212/v5.15/standard/cn-sdkv5.4/octeon
ff4a9f83a552 20260212/v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
ba56530ab7d4 20260212/v5.15/standard/cn-sdkv5.15/octeon
dbacf1cffa61 20260212/v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
c8462e59d79b 20260212/v5.15/standard/cn-sdk-12.25.02-6/octeon
153f8112cba9 20260212/v5.15/standard/preempt-rt/cn-sdk-12.25.02-6/octeon
6bded2815b09 20260212/v5.15/standard/ti-sdk-5.10/ti-j72xx
5aa38ef4c546 20260212/v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
76b6126b6cc0 20260212/v5.15/standard/nxp-sdk-5.15/nxp-soc
b7a7ba116600 20260212/v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
e646a5de2506 20260212/v5.15/standard/nvidia-orin
470fc0a28a4b 20260212/v5.15/standard/preempt-rt/nvidia-orin
83cf79c37013 20260212/v5.15/standard/bcm-2xxx-rpi
280bf0e68954 20260212/v5.15/standard/preempt-rt/bcm-2xxx-rpi
bbce737a376b 20260212/v5.15/standard/nxp-sdk-5.15/nxp-s32g
cfded879e986 20260212/v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
d61f6f284e62 20260212/v5.15/standard/nxp-sdk-5.10/nxp-s32g
cf2656844c98 20260212/v5.15/standard/preempt-rt/nxp-sdk-5.10/nxp-s32g
f99466d822f3 20260212/v5.15/standard/intel-sdk-5.15/intel-socfpga
22135a1c0bdd 20260212/v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
39333b221943 20260212/v5.15/standard/x86
5fe600b0e486 20260212/v5.15/standard/preempt-rt/x86
ecdd946d9d07 20260212/v5.15/standard/sdkv5.15/xlnx-soc
52a7f4e87553 20260212/v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
558dd88d4de4 20260212/v6.1/standard/sdkv5.10/axxia
885feaba57a0 20260212/v6.1/standard/preempt-rt/sdkv5.10/axxia
e5dceae10f87 20260212/v6.1/standard/base
6ed98adbb06c 20260212/v6.1/standard/preempt-rt/base
824971b997cb 20260212/v6.1/standard/ti-sdk-6.1/ti-j7xxx
a22e0ab21349 20260212/v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
0382641fcdb5 20260212/v6.1/standard/ti-sdk-5.10/ti-j7xxx
c6b36cdbc8ce 20260212/v6.1/standard/preempt-rt/ti-sdk-5.10/ti-j7xxx
062c46343e1b 20260212/v6.1/standard/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
d1acae60275f 20260212/v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
bd3256d99430 20260212/v6.1/standard/cn-sdkv5.15/octeon
25b623bcd54d 20260212/v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
266258693b81 20260212/v6.1/standard/cn-sdkv6.1/octeon
a9d93b717acf 20260212/v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
62acbfdfb799 20260212/v6.1/standard/microchip-polarfire-soc
521621e36fbc 20260212/v6.1/standard/preempt-rt/microchip-polarfire-soc
ae1bd50535cb 20260212/v6.1/standard/bcm-2xxx-rpi
bd2a78222c3a 20260212/v6.1/standard/preempt-rt/bcm-2xxx-rpi
7e54ad0c53da 20260212/v6.1/standard/nxp-sdk-5.15/nxp-s32g
9acd1c543ebd 20260212/v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
6f46a7d82202 20260212/v6.1/standard/intel-sdk-6.1/intel-socfpga
c4d415b24779 20260212/v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
f625f286c02c 20260212/v6.1/standard/x86
95112e836b0b 20260212/v6.1/standard/preempt-rt/x86
bea5b98bee32 20260212/v6.1/standard/sdkv6.1/xlnx-soc
d4d66ba65c0b 20260212/v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
15a44cb76e81 20260212/v6.12/standard/base
9ae9b38fabac 20260212/v6.12/standard/preempt-rt/base
14ff3ecf3e90 20260212/v6.12/standard/nvidia-sdk-5.15/nvidia-soc
5f62de589a54 20260212/v6.12/standard/preempt-rt/nvidia-sdk-5.15/nvidia-soc
3085282e0435 20260212/v6.12/standard/nxp-sdk-6.12/nxp-soc
#Have textual conflicts
728fcddcdb19 20260212/v6.12/standard/preempt-rt/nxp-sdk-6.12/nxp-soc
#Have textual conflicts
61425c75283f 20260212/v6.12/standard/octeon
e423bde2d4b1 20260212/v6.12/standard/preempt-rt/octeon
c693423458b3 20260212/v6.12/standard/bcm-2xxx-rpi
2111cc4dda39 20260212/v6.12/standard/preempt-rt/bcm-2xxx-rpi
8fc43f2e51c4 20260212/v6.12/standard/nxp-sdk-6.6/nxp-s32g
2fd9120f6093 20260212/v6.12/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
07d6227e718e 20260212/v6.12/standard/intel-socfpga
e635ef5c570c 20260212/v6.12/standard/preempt-rt/intel-socfpga
451d26437fc5 20260212/v6.12/standard/ti-soc
39a2544c8758 20260212/v6.12/standard/preempt-rt/ti-soc
615ec73642f8 20260212/v6.12/standard/x86
a65b17f9db9d 20260212/v6.12/standard/preempt-rt/x86
1954d4d298a8 20260212/v6.12/standard/xlnx-soc
8c9ec0bce854 20260212/v6.12/standard/preempt-rt/xlnx-soc
5e1f29c811c4 20260212/v6.6/standard/sdkv5.15/axxia
1263e5116d58 20260212/v6.6/standard/preempt-rt/sdkv5.15/axxia
ec871da2468f 20260212/v6.6/standard/base
e1760072b5d4 20260212/v6.6/standard/preempt-rt/base
e1b7bebb35cf 20260212/v6.6/standard/nxp-sdk-6.6/nxp-soc
#Have textual conflicts
14c9bc9aad03 20260212/v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
#Have textual conflicts
8cb2309dbe9f 20260212/v6.6/standard/cn-sdkv6.1/octeon
95b20d1b55cb 20260212/v6.6/standard/preempt-rt/cn-sdkv6.1/octeon
9211a152a419 20260212/v6.6/standard/cn-sdkv6.6/octeon
dc48220bbbb4 20260212/v6.6/standard/preempt-rt/cn-sdkv6.6/octeon
37b6f085eb65 20260212/v6.6/standard/nvidia-orin
#Have textual conflicts
9fac08de6d1d 20260212/v6.6/standard/preempt-rt/nvidia-orin
#Have textual conflicts
10224e57d3ee 20260212/v6.6/standard/microchip-polarfire-soc
7c1ee1546b0b 20260212/v6.6/standard/preempt-rt/microchip-polarfire-soc
76a9145a8c80 20260212/v6.6/standard/bcm-2xxx-rpi
2e047d26b485 20260212/v6.6/standard/preempt-rt/bcm-2xxx-rpi
018aa10ede50 20260212/v6.6/standard/nxp-sdk-6.6/nxp-s32g
cad45be75424 20260212/v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
ad719521700e 20260212/v6.6/standard/intel-sdk-6.6/intel-socfpga
48fce46c5f59 20260212/v6.6/standard/preempt-rt/intel-sdk-6.6/intel-socfpga
820ee00d4b5f 20260212/v6.6/standard/ti-sdk-6.6/ti-soc
d01fed794e56 20260212/v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc
5fbe226dd8b5 20260212/v6.6/standard/x86
6b5aa72d48fa 20260212/v6.6/standard/preempt-rt/x86
37c712508300 20260212/v6.6/standard/sdkv6.6/xlnx-soc
d2025af42a6e 20260212/v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc
In addition to several minor conflicts across multiple branches, the following
two require particular attention:
- v6.12 nxp branches:
Two commits from the stable and the SDK respectively address the same GPU hang
issue on imx8mm, but adopt significantly different approaches:
b8ea101959ab ("pmdomain: imx: gpcv2: Fix the imx8mm gpu hang due to wrong
adb400 reset")
9bab08e44430 ("LF-11441-01: Fix the imx8mm gpu hang due to adb400 reset
wrongly")
We have decided to revert the SDK commit and keep the stable one, as the
latter
is simpler and less likely to introduce conflicts during future stable
updates.
- v6.6 orin branches:
Two commits from the stable and SDK address the same SPI issue on Tegra,
but they take significantly different approaches.
d0a6e43d7ccc ("spi: tegra114: Preserve SPI mode bits in def_command1_reg")
60d1db069c54 ("spi: spi-tegra114: retain the spi mode")
We have decided to revert the SDK commit and keep the stable one, as the
latter
is simpler and less likely to introduce conflicts during future stable
updates.
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 (#16300):
https://lists.yoctoproject.org/g/linux-yocto/message/16300
Mute This Topic: https://lists.yoctoproject.org/mt/117771742/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
