Hi Bruce,
This is a trial merge of the stable kernel v5.15.167 v6.1.110 v6.6.51 for the
following branches in the linux-yocto.
2a6fedef6c69 v5.15/standard/sdkv5.10/axxia
db8b3a6098f2 v5.15/standard/preempt-rt/sdkv5.10/axxia
c3cab9e45416 v5.15/standard/base
6f4ca7b79e2a v5.15/standard/preempt-rt/base
f68803fe3176 v5.15/standard/cn-sdkv5.4/octeon
c8758bbf632b v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
0eb5fc496c2e v5.15/standard/cn-sdkv5.15/octeon
eb8f356ca1ad v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
6ead991c2124 v5.15/standard/ti-sdk-5.10/ti-j72xx
#Have textual conflicts
2cc24240de4b v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
#Have textual conflicts
dc92a4794dd5 v5.15/standard/nxp-sdk-5.15/nxp-soc
fb85c0de20a2 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
80e9776d4086 v5.15/standard/bcm-2xxx-rpi
3f3211f643e0 v5.15/standard/preempt-rt/bcm-2xxx-rpi
276b294ec408 v5.15/standard/nxp-sdk-5.15/nxp-s32g
18ad9875c902 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
ab2af68ef8db v5.15/standard/intel-sdk-5.15/intel-socfpga
7ebb98c1e99f v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
b7d39c42865c v5.15/standard/x86
#Have textual conflicts
f8532f3bb021 v5.15/standard/preempt-rt/x86
#Have textual conflicts
24b198f96eb3 v5.15/standard/sdkv5.15/xlnx-soc
#Have textual conflicts
d8fea47ea15e v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
#Have textual conflicts
d37114d2522a v6.1/standard/sdkv5.10/axxia
d7de91d54701 v6.1/standard/preempt-rt/sdkv5.10/axxia
a99a541c085b v6.1/standard/base
89b14e676b42 v6.1/standard/preempt-rt/base
c7ea68953fa9 v6.1/standard/ti-sdk-6.1/ti-j7xxx
#Have textual conflicts
d1c229d86396 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
#Have textual conflicts
61667baf9f2c v6.1/standard/nxp-sdk-6.1/nxp-soc
28cd338731d7 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
b36012ced0bf v6.1/standard/cn-sdkv5.15/octeon
726ca49d75d6 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
f393fe00d65c v6.1/standard/cn-sdkv6.1/octeon
c69aed36860a v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
16f09c4aafec v6.1/standard/microchip-polarfire-soc
9096e19ccb90 v6.1/standard/preempt-rt/microchip-polarfire-soc
d720b2fa62ba v6.1/standard/bcm-2xxx-rpi
654edb01fbc2 v6.1/standard/preempt-rt/bcm-2xxx-rpi
d78a31da67fc v6.1/standard/nxp-sdk-5.15/nxp-s32g
9146faaa305e v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
071d7421fa71 v6.1/standard/intel-sdk-6.1/intel-socfpga
d011848ab816 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
dffb8bde0978 v6.1/standard/x86
c5ce9df3d0ba v6.1/standard/preempt-rt/x86
e77b163284cf v6.1/standard/sdkv6.1/xlnx-soc
49e2aa896417 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
430595882ea7 v6.6/standard/sdkv5.15/axxia
b5c06c506fa2 v6.6/standard/preempt-rt/sdkv5.15/axxia
3311eb6fc79d v6.6/standard/base
5b1c3c4ff754 v6.6/standard/preempt-rt/base
b01fc24f8312 v6.6/standard/nxp-sdk-6.6/nxp-soc
#Have textual and semantic conflicts
55b738bd02ad v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
#Have textual and semantic conflicts
690bed9c8765 v6.6/standard/cn-sdkv6.1/octeon
525f7e584477 v6.6/standard/preempt-rt/cn-sdkv6.1/octeon
f66ad6dc5242 v6.6/standard/microchip-polarfire-soc
8b70145b5374 v6.6/standard/preempt-rt/microchip-polarfire-soc
10097c9fd1aa v6.6/standard/bcm-2xxx-rpi
#Have textual conflicts
e8ab15454a95 v6.6/standard/preempt-rt/bcm-2xxx-rpi
#Have textual conflicts
145ca067562d v6.6/standard/nxp-sdk-6.6/nxp-s32g
#Have textual conflicts
1ff52666b648 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
#Have textual conflicts
fe5a690781f5 v6.6/standard/intel-sdk-6.6/intel-socfpga
f2f845847d69 v6.6/standard/preempt-rt/intel-sdk-6.6/intel-socfpga
a95aa0918863 v6.6/standard/ti-sdk-6.6/ti-soc
#Have textual conflicts
5c004e9b4d0c v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc
#Have textual conflicts
f6beedc0584a v6.6/standard/sdkv6.6/xlnx-soc
b1faf2b5a6f2 v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc
There are some merge conflicts in every kernel version, and special attention
should be given to the semantic conflicts in v6.6 nxp 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 (#14394):
https://lists.yoctoproject.org/g/linux-yocto/message/14394
Mute This Topic: https://lists.yoctoproject.org/mt/108445222/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
