Hi Bruce,
This is a trial merge of the stable kernel v5.15.197 v6.1.159 v6.12.61 v6.6.119
for the following branches in the linux-yocto.
2a13c0d3b88a 20251207/v5.15/standard/sdkv5.10/axxia
bcc3a746aa93 20251207/v5.15/standard/preempt-rt/sdkv5.10/axxia
ee476a206f8c 20251207/v5.15/standard/base
1dfa3af78702 20251207/v5.15/standard/preempt-rt/base
7daada6a600b 20251207/v5.15/standard/cn-sdkv5.4/octeon
#Have textual conflicts
164a7d1d6744 20251207/v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
#Have textual conflicts
886b10e79342 20251207/v5.15/standard/cn-sdkv5.15/octeon
#Have textual conflicts
53c9f889ee15 20251207/v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual conflicts
5a4eee210a93 20251207/v5.15/standard/cn-sdk-12.25.02-6/octeon
#Have textual conflicts
0f9bcdc7e1d0 20251207/v5.15/standard/preempt-rt/cn-sdk-12.25.02-6/octeon
#Have textual conflicts
9a672f33978b 20251207/v5.15/standard/ti-sdk-5.10/ti-j72xx
fe4bfa4756fc 20251207/v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
c668043622ef 20251207/v5.15/standard/nxp-sdk-5.15/nxp-soc
f28de083c6c7 20251207/v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
b9aff8bc5da9 20251207/v5.15/standard/nvidia-orin
#Have textual conflicts
43eeb0a85045 20251207/v5.15/standard/preempt-rt/nvidia-orin
#Have textual conflicts
a2ae4a90dab3 20251207/v5.15/standard/bcm-2xxx-rpi
3b87ab877fd0 20251207/v5.15/standard/preempt-rt/bcm-2xxx-rpi
3d3578e4f071 20251207/v5.15/standard/nxp-sdk-5.15/nxp-s32g
#Have textual conflicts
18be09fc7624 20251207/v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
#Have textual conflicts
357255bc26c5 20251207/v5.15/standard/nxp-sdk-5.10/nxp-s32g
#Have textual conflicts
83c6b22f92d6 20251207/v5.15/standard/preempt-rt/nxp-sdk-5.10/nxp-s32g
#Have textual conflicts
67c137053982 20251207/v5.15/standard/intel-sdk-5.15/intel-socfpga
#Have textual conflicts
315b00bb6b64 20251207/v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
#Have textual conflicts
8267eebee59e 20251207/v5.15/standard/x86
abbbe56afeaa 20251207/v5.15/standard/preempt-rt/x86
a5b2e159a285 20251207/v5.15/standard/sdkv5.15/xlnx-soc
#Have textual conflicts
94e1aa949fae 20251207/v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
#Have textual conflicts
2d30f35f3c5c 20251207/v6.1/standard/sdkv5.10/axxia
5649436123b8 20251207/v6.1/standard/preempt-rt/sdkv5.10/axxia
048fe6117a80 20251207/v6.1/standard/base
36ae615e6cdb 20251207/v6.1/standard/preempt-rt/base
13f3a118a122 20251207/v6.1/standard/ti-sdk-6.1/ti-j7xxx
#Have textual conflicts
44ea5526e5c7 20251207/v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
#Have textual conflicts
d4d9bf2631ac 20251207/v6.1/standard/ti-sdk-5.10/ti-j7xxx
d58cd05dbb19 20251207/v6.1/standard/preempt-rt/ti-sdk-5.10/ti-j7xxx
#Have textual conflicts
8c0df66b263c 20251207/v6.1/standard/nxp-sdk-6.1/nxp-soc
e39f711a73a5 20251207/v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
b166c18a2ef5 20251207/v6.1/standard/cn-sdkv5.15/octeon
#Have textual and semantic conflicts
895d953700a2 20251207/v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual and semantic conflicts
9dedd8159aa8 20251207/v6.1/standard/cn-sdkv6.1/octeon
#Have textual and semantic conflicts
6d336ef72028 20251207/v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
#Have textual and semantic conflicts
b68b0da3a651 20251207/v6.1/standard/microchip-polarfire-soc
043c71d33e4e 20251207/v6.1/standard/preempt-rt/microchip-polarfire-soc
f596e83911e1 20251207/v6.1/standard/bcm-2xxx-rpi
#Have textual conflicts
c777b5bfd454 20251207/v6.1/standard/preempt-rt/bcm-2xxx-rpi
#Have textual conflicts
edc36d803c29 20251207/v6.1/standard/nxp-sdk-5.15/nxp-s32g
#Have textual conflicts
4d51a6e2fb8e 20251207/v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
#Have textual conflicts
317227bec026 20251207/v6.1/standard/intel-sdk-6.1/intel-socfpga
#Have textual conflicts
4c2564cd6921 20251207/v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
#Have textual conflicts
8b110bf34659 20251207/v6.1/standard/x86
ccb6677b9320 20251207/v6.1/standard/preempt-rt/x86
b599564a57bf 20251207/v6.1/standard/sdkv6.1/xlnx-soc
ffb9445f8e0a 20251207/v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
28892642b260 20251207/v6.12/standard/base
184aa79e4887 20251207/v6.12/standard/preempt-rt/base
2a9fb8637f5f 20251207/v6.12/standard/nvidia-sdk-5.15/nvidia-soc
c601f0d7df8d 20251207/v6.12/standard/preempt-rt/nvidia-sdk-5.15/nvidia-soc
7bd00b518cb8 20251207/v6.12/standard/nxp-sdk-6.12/nxp-soc
#Have textual conflicts
618ff1522ffd 20251207/v6.12/standard/preempt-rt/nxp-sdk-6.12/nxp-soc
#Have textual conflicts
770bc704a50b 20251207/v6.12/standard/octeon
ea7e1c0c87ca 20251207/v6.12/standard/preempt-rt/octeon
3b8441b41a55 20251207/v6.12/standard/bcm-2xxx-rpi
#Have textual conflicts
2a3716e5c73d 20251207/v6.12/standard/preempt-rt/bcm-2xxx-rpi
#Have textual conflicts
46e5731aae69 20251207/v6.12/standard/nxp-sdk-6.6/nxp-s32g
080395f54955 20251207/v6.12/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
ef68d24b7b87 20251207/v6.12/standard/intel-socfpga
#Have textual conflicts
47a3d18dfea5 20251207/v6.12/standard/preempt-rt/intel-socfpga
#Have textual conflicts
9757c78aacb9 20251207/v6.12/standard/ti-soc
#Have textual conflicts
65a98f1483b5 20251207/v6.12/standard/preempt-rt/ti-soc
#Have textual conflicts
f7b6d8ab6027 20251207/v6.12/standard/x86
aa8a40ed553c 20251207/v6.12/standard/preempt-rt/x86
b5ea3ab8430f 20251207/v6.12/standard/xlnx-soc
834d45ea3582 20251207/v6.12/standard/preempt-rt/xlnx-soc
4dd035db7397 20251207/v6.6/standard/sdkv5.15/axxia
a3d69c763669 20251207/v6.6/standard/preempt-rt/sdkv5.15/axxia
63849380097b 20251207/v6.6/standard/base
a3f18eb43eee 20251207/v6.6/standard/preempt-rt/base
5a221e870e28 20251207/v6.6/standard/nxp-sdk-6.6/nxp-soc
#Have textual and semantic conflicts
a20878524fa9 20251207/v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
#Have textual and semantic conflicts
cb3847c01af6 20251207/v6.6/standard/cn-sdkv6.1/octeon
7fee1b1359c6 20251207/v6.6/standard/preempt-rt/cn-sdkv6.1/octeon
ca1c1332ea10 20251207/v6.6/standard/cn-sdkv6.6/octeon
c4827922b808 20251207/v6.6/standard/preempt-rt/cn-sdkv6.6/octeon
919a5fae96ef 20251207/v6.6/standard/nvidia-orin
f338aee165b1 20251207/v6.6/standard/preempt-rt/nvidia-orin
66f59358cefa 20251207/v6.6/standard/microchip-polarfire-soc
#Have textual and semantic conflicts
e78784c26586 20251207/v6.6/standard/preempt-rt/microchip-polarfire-soc
#Have textual and semantic conflicts
86c826ccd9bc 20251207/v6.6/standard/bcm-2xxx-rpi
#Have textual conflicts
79fb32323e23 20251207/v6.6/standard/preempt-rt/bcm-2xxx-rpi
#Have textual conflicts
7a66563d4b7e 20251207/v6.6/standard/nxp-sdk-6.6/nxp-s32g
6840658e3916 20251207/v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
8dc34182b0a0 20251207/v6.6/standard/intel-sdk-6.6/intel-socfpga
#Have textual conflicts
fc0c3a46f4bc 20251207/v6.6/standard/preempt-rt/intel-sdk-6.6/intel-socfpga
#Have textual conflicts
21451daa6de4 20251207/v6.6/standard/ti-sdk-6.6/ti-soc
#Have textual conflicts
dac5181bee1c 20251207/v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc
#Have textual conflicts
ccf4537c1254 20251207/v6.6/standard/x86
781382dea2b0 20251207/v6.6/standard/preempt-rt/x86
e6d24f10eaae 20251207/v6.6/standard/sdkv6.6/xlnx-soc
c4ab88cb786a 20251207/v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc
We have encountered numerous conflicts during this stable update cycle. The
following
require increased attention:
- For the v5.15 octeon branches:
The stable patch 42ccfa662c2e ("x86/resctrl: Fix miscount of bandwidth event
when
reactivating previously unavailable RMID") does not apply to the current
codebase,
so we should keep the existing implementation unchanged.
- For v5.15 and v6.1 s32g branches:
The modifications introduced by stable commit cf3e51d388e1
("clocksource/drivers/vf-pit:
Replace raw_readl/writel with readl/writel") have already been incorporated
in the SDK
commit. Therefore, we only need to keep the existing code as is.
- For v6.1 octeon branches:
Two semantic merge conflicts have arisen in the drivers/acpi/pptt.c file as a
result of
the API change to acpi_count_levels() introduced by the stable commit. We
need to adjust
the parameter of acpi_count_levels() due to this change.
- For v6.6 and v6.12 nxp branches:
The merge conflicts in drivers/spi/spi-nxp-fspi.c are particularly
challenging and require
careful integration of changes from both the stable branch and the SDK.
Additionally,
there are two semantic merge conflicts to address:
- In drivers/spi/spi-nxp-fspi.c, replace of_property_read_bool() with
fwnode_property_read_bool().
- In drivers/net/ethernet/freescale/fec_ptp.c, change
spin_unlock_irqrestore() to raw_spin_unlock_irqrestore().
- For v6.6 polafire branches:
Two similar modifications were introduced in both the stable and SDK commits,
but with
different variable name. Retain the changes from the SDK commit and revert
those from
the stable commit, as there are still patches that depend on the SDK
modifications.
94b3c7558748 ("spi: spi-mem: Allow specifying the byte order in Octal DTR
mode")
6932ca6cce0e ("spi: spi-mem: Allow specifying the byte order in DTR mode")
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 (#16033):
https://lists.yoctoproject.org/g/linux-yocto/message/16033
Mute This Topic: https://lists.yoctoproject.org/mt/116659511/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
