Hi Bruce,
This is a trial merge of the stable kernel v5.15.154 v6.1.85 v6.6.26 for the
following branches in the linux-yocto.
5925e69a8f2a v5.15/standard/sdkv5.10/axxia
5bf35db75320 v5.15/standard/preempt-rt/sdkv5.10/axxia
#Have textual conflicts
f1612b786de6 v5.15/standard/base
8363ea6d87e8 v5.15/standard/preempt-rt/base
#Have textual conflicts
347b61fa360d v5.15/standard/cn-sdkv5.4/octeon
#Have textual conflicts
e64df8cfa8eb v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
#Have textual conflicts
bc767f3e7825 v5.15/standard/cn-sdkv5.15/octeon
#Have textual conflicts
90eb13df6482 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual conflicts
1cabfc8f2dbc v5.15/standard/ti-sdk-5.10/ti-j72xx
#Have semantic conflicts
4d083daef3ed v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
#Have textual and semantic conflicts
06e883c42fe2 v5.15/standard/nxp-sdk-5.15/nxp-soc
e0ace473d4b2 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
769a2392ad3d v5.15/standard/bcm-2xxx-rpi
#Have textual conflicts
1deb8e9ba48e v5.15/standard/preempt-rt/bcm-2xxx-rpi
#Have textual conflicts
cf618629fe57 v5.15/standard/nxp-sdk-5.15/nxp-s32g
cf11e0f71c72 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
#Have textual conflicts
a18708278a1d v5.15/standard/intel-sdk-5.15/intel-socfpga
bb504ab94f51 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
#Have textual conflicts
74ed73ae4e31 v5.15/standard/x86
977d037e28ee v5.15/standard/preempt-rt/x86
#Have textual conflicts
2dd9e704edd6 v5.15/standard/sdkv5.15/xlnx-soc
2a10f2529c31 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
#Have textual conflicts
30f61df8ab5a v6.1/standard/sdkv5.10/axxia
1a4ab3c1207d v6.1/standard/preempt-rt/sdkv5.10/axxia
92979a1bf2dc v6.1/standard/base
44805c4a2678 v6.1/standard/preempt-rt/base
a87a14225944 v6.1/standard/ti-sdk-6.1/ti-j7xxx
c829d63cc5b3 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
7ed1b193352b v6.1/standard/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
0ad42edcaeeb v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
7b70f4712dbd v6.1/standard/cn-sdkv5.15/octeon
4ce7dd8f0122 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
6c4e1ea6cee0 v6.1/standard/cn-sdkv6.1/octeon
3228b493dee6 v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
c44ef81828df v6.1/standard/microchip-polarfire-soc
735431c8ee60 v6.1/standard/preempt-rt/microchip-polarfire-soc
321bb8234822 v6.1/standard/bcm-2xxx-rpi
6d266c65f08c v6.1/standard/preempt-rt/bcm-2xxx-rpi
a40c5221ae3c v6.1/standard/nxp-sdk-5.15/nxp-s32g
11d890c265bb v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
5401d6047150 v6.1/standard/intel-sdk-6.1/intel-socfpga
9203c9ba2bc3 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
745e34c08a7e v6.1/standard/x86
019e525b1a09 v6.1/standard/preempt-rt/x86
35b64bc7999d v6.1/standard/sdkv6.1/xlnx-soc
a5dc8336cb79 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
5c452b703c5a v6.6/standard/base
f8319f489059 v6.6/standard/preempt-rt/base
0757ab7120c5 v6.6/standard/nxp-sdk-6.6/nxp-soc
#Have semantic conflicts
65d9bccac0ed v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
#Have semantic conflicts
Most of the merge conflicts come from v5.15 kernel.
- There is a merge conflict on the v5.15 rt kernel. It is caused by
stable commit 9bd2f11ac9ef ("printk: Update @console_may_schedule in
console_trylock_spinning()")
rt commit 2d440f3f2ee5 ("printk: move console printing to kthreads")
We just need to drop the changes introduced by stable commit 9bd2f11ac9ef
because the original
console_trylock_spinning() function was already delete by rt commit
2d440f3f2ee5.
- There is a semantic conflict on v5.15 j72xx branches. We need to drop the
umin() function
in drivers/media/platform/vxe-vxd/decoder/h264_secure_parser.c because an
umin() macro
was introduce by stable commit cf716d5a0dd8 ("minmax: add umin(a, b) and
umax(a, b)")
- There is also a semantic conflict on v6.6 nxp branches. We need adjust the
change of
stable commit e1e4a5cbb0a1 ("ASoC: fsl_sai: Fix no frame sync clock issue on
i.MX8MP")
based on the changes introduced by sdk commit ce4d3e93d18f ("ASoC: fsl_sai:
add fsl,txm-rxs
property support")
All the branches have passed my build test. I have pushed all these branches 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 (#13795):
https://lists.yoctoproject.org/g/linux-yocto/message/13795
Mute This Topic: https://lists.yoctoproject.org/mt/105461047/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
