Hi Bruce,
This is a trial merge of the stable kernel v6.1.103 v6.6.44 for the following
branches in the linux-yocto.
109b5922f3c2 v6.1/standard/sdkv5.10/axxia
6eb30505e1fe v6.1/standard/preempt-rt/sdkv5.10/axxia
0b9f39c92954 v6.1/standard/base
d640b5fe21f9 v6.1/standard/preempt-rt/base
f74e195b6aa5 v6.1/standard/ti-sdk-6.1/ti-j7xxx
#Have textual conflicts
a0c010b752c3 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
#Have textual conflicts
46888542a506 v6.1/standard/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
d791627ea0db v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
c67a8e88c44f v6.1/standard/cn-sdkv5.15/octeon
102309178027 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
44eeff9b6920 v6.1/standard/cn-sdkv6.1/octeon
1d14b93324b5 v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
3e62ea4cb08b v6.1/standard/microchip-polarfire-soc
f81619f4f599 v6.1/standard/preempt-rt/microchip-polarfire-soc
6cc53df07bb5 v6.1/standard/bcm-2xxx-rpi
2373c8396be3 v6.1/standard/preempt-rt/bcm-2xxx-rpi
943578cd400f v6.1/standard/nxp-sdk-5.15/nxp-s32g
15a06db15bc6 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
d3b3ad261f86 v6.1/standard/intel-sdk-6.1/intel-socfpga
e90bc78581d1 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
1437c1192440 v6.1/standard/x86
1dd2f6b34912 v6.1/standard/preempt-rt/x86
d3ef8ad0024e v6.1/standard/sdkv6.1/xlnx-soc
#Have textual conflicts
6aea3f5bd3c3 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
#Have textual conflicts
eb8f5d80b70c v6.6/standard/sdkv5.15/axxia
7ac185970111 v6.6/standard/preempt-rt/sdkv5.15/axxia
d6e9bfa7fed2 v6.6/standard/base
#Have textual conflicts
74fe9f41a2dc v6.6/standard/preempt-rt/base
d9bfc3f3cce9 v6.6/standard/nxp-sdk-6.6/nxp-soc
#Have textual conflicts
b4fd7baab2cb v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
#Have textual conflicts
60fa5f1dbfe4 v6.6/standard/cn-sdkv6.1/octeon
e19316d2a692 v6.6/standard/preempt-rt/cn-sdkv6.1/octeon
1170e00297c5 v6.6/standard/microchip-polarfire-soc
#Have textual and semantic conflicts
92950c932a81 v6.6/standard/preempt-rt/microchip-polarfire-soc
#Have textual and semantic conflicts
595f0f9416e7 v6.6/standard/nxp-sdk-6.6/nxp-s32g
1fe8a49d65cb v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
515740e02585 v6.6/standard/ti-sdk-6.6/ti-soc
#Have textual conflicts
387e59465f5f v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc
#Have textual conflicts
4e0ca495e17e v6.6/standard/sdkv6.6/xlnx-soc
#Have textual and semantic conflicts
1665aa386cde v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc
#Have textual and semantic conflicts
There are some merge conflicts on both v6.1 and v6.6 kernels. Special attention
should be paid to the semantic conflicts in the v6.6 polarfile and xilinx
branches.
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 (#14216):
https://lists.yoctoproject.org/g/linux-yocto/message/14216
Mute This Topic: https://lists.yoctoproject.org/mt/107715624/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
