Hi Bruce,
This is a trial merge of the stable kernel v6.1.160 v6.12.65 v6.6.120 for the
following branches in the linux-yocto.
dfbadcbf6cf3 20260113/v6.1/standard/sdkv5.10/axxia
5074bb1a3957 20260113/v6.1/standard/preempt-rt/sdkv5.10/axxia
f32392deb098 20260113/v6.1/standard/base
f31d50087267 20260113/v6.1/standard/preempt-rt/base
cc8585713d1e 20260113/v6.1/standard/ti-sdk-6.1/ti-j7xxx
#Have textual conflicts
72a6a7e51d7f 20260113/v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
#Have textual conflicts
c44e83797188 20260113/v6.1/standard/ti-sdk-5.10/ti-j7xxx
#Have textual conflicts
c1eafd726e73 20260113/v6.1/standard/preempt-rt/ti-sdk-5.10/ti-j7xxx
#Have textual conflicts
db245ab21392 20260113/v6.1/standard/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
c4144c8ff6cc 20260113/v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
8c10850e770f 20260113/v6.1/standard/cn-sdkv5.15/octeon
e9533eaa5210 20260113/v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
83240263f619 20260113/v6.1/standard/cn-sdkv6.1/octeon
5d51a20f72a5 20260113/v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
02d2c51aa959 20260113/v6.1/standard/microchip-polarfire-soc
75326c0f7f1e 20260113/v6.1/standard/preempt-rt/microchip-polarfire-soc
7681de65f1bf 20260113/v6.1/standard/bcm-2xxx-rpi
4db998cea6cb 20260113/v6.1/standard/preempt-rt/bcm-2xxx-rpi
931fe52f771c 20260113/v6.1/standard/nxp-sdk-5.15/nxp-s32g
#Have textual and semantic conflicts
41ff9f2df28f 20260113/v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
#Have textual and semantic conflicts
bb2464e176f1 20260113/v6.1/standard/intel-sdk-6.1/intel-socfpga
#Have textual conflicts
06ae02ef16fa 20260113/v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
#Have textual conflicts
c4b37768ce28 20260113/v6.1/standard/x86
27b80bd04244 20260113/v6.1/standard/preempt-rt/x86
6debdc697a8b 20260113/v6.1/standard/sdkv6.1/xlnx-soc
#Have textual conflicts
58658f4ec007 20260113/v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
#Have textual conflicts
cfc4e0680406 20260113/v6.12/standard/base
f00227b955b5 20260113/v6.12/standard/preempt-rt/base
98edc72f459e 20260113/v6.12/standard/nvidia-sdk-5.15/nvidia-soc
4b1b9820952c 20260113/v6.12/standard/preempt-rt/nvidia-sdk-5.15/nvidia-soc
83399ee7718a 20260113/v6.12/standard/nxp-sdk-6.12/nxp-soc
fb93e8ee5e07 20260113/v6.12/standard/preempt-rt/nxp-sdk-6.12/nxp-soc
f0721d611aee 20260113/v6.12/standard/octeon
dbf9cb91b7aa 20260113/v6.12/standard/preempt-rt/octeon
88305db2a5d7 20260113/v6.12/standard/bcm-2xxx-rpi
8ed5bcac706d 20260113/v6.12/standard/preempt-rt/bcm-2xxx-rpi
b3af13402e67 20260113/v6.12/standard/nxp-sdk-6.6/nxp-s32g
4e7b1e790c74 20260113/v6.12/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
eaf7dbe2a53a 20260113/v6.12/standard/intel-socfpga
763b9350e879 20260113/v6.12/standard/preempt-rt/intel-socfpga
5f8c00eef4ab 20260113/v6.12/standard/ti-soc
0859d5be31d6 20260113/v6.12/standard/preempt-rt/ti-soc
7c26ddafc708 20260113/v6.12/standard/x86
93563cd09a55 20260113/v6.12/standard/preempt-rt/x86
1761ad4d8474 20260113/v6.12/standard/xlnx-soc
4ef0c676b220 20260113/v6.12/standard/preempt-rt/xlnx-soc
e0eee518c847 20260113/v6.6/standard/sdkv5.15/axxia
52f0ad932751 20260113/v6.6/standard/preempt-rt/sdkv5.15/axxia
#Have textual conflicts
e9d7a6166ca0 20260113/v6.6/standard/base
e410f00431db 20260113/v6.6/standard/preempt-rt/base
#Have textual conflicts
03825e02a38a 20260113/v6.6/standard/nxp-sdk-6.6/nxp-soc
#Have textual conflicts
cffaa2afb9d6 20260113/v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
#Have textual conflicts
3132ccebe438 20260113/v6.6/standard/cn-sdkv6.1/octeon
8b17fe9080b3 20260113/v6.6/standard/preempt-rt/cn-sdkv6.1/octeon
#Have textual conflicts
69ed92df793c 20260113/v6.6/standard/cn-sdkv6.6/octeon
82b476221dad 20260113/v6.6/standard/preempt-rt/cn-sdkv6.6/octeon
#Have textual conflicts
261faef7236e 20260113/v6.6/standard/nvidia-orin
2ae508fc198d 20260113/v6.6/standard/preempt-rt/nvidia-orin
#Have textual conflicts
b7ccb36adee6 20260113/v6.6/standard/microchip-polarfire-soc
3809e284849a 20260113/v6.6/standard/preempt-rt/microchip-polarfire-soc
#Have textual conflicts
030ad6fa26ba 20260113/v6.6/standard/bcm-2xxx-rpi
#Have textual conflicts
cb8f7b137043 20260113/v6.6/standard/preempt-rt/bcm-2xxx-rpi
#Have textual conflicts
205be79d2bde 20260113/v6.6/standard/nxp-sdk-6.6/nxp-s32g
#Have textual conflicts
c4af01453f53 20260113/v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
#Have textual conflicts
50bc2afbe8c2 20260113/v6.6/standard/intel-sdk-6.6/intel-socfpga
#Have textual and semantic conflicts
c1d9da53e730 20260113/v6.6/standard/preempt-rt/intel-sdk-6.6/intel-socfpga
#Have textual and semantic conflicts
4fbb12009b8a 20260113/v6.6/standard/ti-sdk-6.6/ti-soc
#Have textual and semantic conflicts
66915c5c7e4c 20260113/v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc
#Have textual and semantic conflicts
36c38db4ce5e 20260113/v6.6/standard/x86
a71abc40e60b 20260113/v6.6/standard/preempt-rt/x86
#Have textual conflicts
15b59b93239f 20260113/v6.6/standard/sdkv6.6/xlnx-soc
#Have textual conflicts
43f66eb3b317 20260113/v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc
#Have textual conflicts
Since the v6.12.65 update is relatively minor, all conflicts are limited to the
v6.1
and v6.6 kernels. Merge conflicts have arisen in the v6.6 rt kernels, which
explains
why they appear across all v6.6 rt branches. However, these are fairly
straightforward
to resolve. The following merge conflicts, in my view, require closer
attention:
- For v6.1 s32g branches:
There are semantic conflicts due to the following stable commits:
7ff66be3686a ("net: stmmac: Pass stmmac_priv in some callbacks")
f4b91e169513 ("net: stmmac: dwmac4: Allow platforms to specify some DMA/MTL
offsets")
We need to update the function dwmac4_rx_watchdog_e50082() to align with the
API changes
introduced by the two commits above.
- For v6.1 socfpga branches:
There are several nasty conflicts on these branches. When resolving the
conflicts introduced
by stable commit ddc3e9d2b7bb ("firmware: stratix10-svc: Add mutex in
stratix10 memory management"),
we must also apply the mutex lock to the code added by the SDK.
Additionally, when handling the conflicts in dwxgmac2_dma_interrupt(), it is
necessary
to merge the changes from both the stable branch and the SDK.
- For v6.6 socfpga branches:
For merge conflicts in the socfpga branches, these occur because the SDK and
stable versions
use two different styles for the same lock (`guard(mutex)` versus
`mutex_lock/unlock()`).
To minimize changes, we have opted to retain the SDK modifications.
- v6.6 ti branches:
The stable commit 21e52dc77629 ("drm/tilcdc: Fix removal actions in case of
failed probe")
and our internal fix 7f86555dc8e9 ("drm/tilcdc: conditionally calling
drm_atomic_helper_shutdown()")
address the same issue with different implementations. When resolving the
conflicts between them,
we should revert our internal change.
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 (#16181):
https://lists.yoctoproject.org/g/linux-yocto/message/16181
Mute This Topic: https://lists.yoctoproject.org/mt/117272512/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
