Hi Bruce,
This is a trial merge of the stable kernel v5.15.162 v6.1.97 v6.6.37 for the
following branches in the linux-yocto.
bc2be28652bc v5.15/standard/sdkv5.10/axxia
f575959af23a v5.15/standard/preempt-rt/sdkv5.10/axxia
#Have textual conflicts
aaaa3792cd58 v5.15/standard/base
#Have textual conflicts
0adc15c3a613 v5.15/standard/preempt-rt/base
#Have textual conflicts
a4b25c4787a9 v5.15/standard/cn-sdkv5.4/octeon
#Have textual conflicts
2dfa58a626de v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
#Have textual conflicts
4ccb00b78da7 v5.15/standard/cn-sdkv5.15/octeon
#Have textual conflicts
2fe1d47f9078 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual conflicts
e8006044b33a v5.15/standard/ti-sdk-5.10/ti-j72xx
2d524d5851c5 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
#Have textual conflicts
71e7219fcffd v5.15/standard/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
4b52e0d64360 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
7d51b86712d8 v5.15/standard/bcm-2xxx-rpi
2712227f2021 v5.15/standard/preempt-rt/bcm-2xxx-rpi
#Have textual conflicts
02d01d570402 v5.15/standard/nxp-sdk-5.15/nxp-s32g
41bf9120d7ec v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
#Have textual conflicts
0468fe326f0a v5.15/standard/intel-sdk-5.15/intel-socfpga
13afb682d4b3 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
#Have textual conflicts
124a1fbfe97a v5.15/standard/x86
338c29337e69 v5.15/standard/preempt-rt/x86
#Have textual conflicts
d162afa31281 v5.15/standard/sdkv5.15/xlnx-soc
43dee604f29d v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
#Have textual conflicts
f004cf484b40 v6.1/standard/sdkv5.10/axxia
bb43ae7bdf6a v6.1/standard/preempt-rt/sdkv5.10/axxia
defe33d995bb v6.1/standard/base
cc7013409cf8 v6.1/standard/preempt-rt/base
2d5759f64ca6 v6.1/standard/ti-sdk-6.1/ti-j7xxx
#Have textual conflicts
936d18b5ccb0 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
#Have textual conflicts
441dccba8b5c v6.1/standard/nxp-sdk-6.1/nxp-soc
386a6d397f6e v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
8aefa7765f72 v6.1/standard/cn-sdkv5.15/octeon
bfcf2f2a8b2b v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
e1b81243176d v6.1/standard/cn-sdkv6.1/octeon
326fc84506ec v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
5681f15915a4 v6.1/standard/microchip-polarfire-soc
7a372d7ec984 v6.1/standard/preempt-rt/microchip-polarfire-soc
57d9eff4fd23 v6.1/standard/bcm-2xxx-rpi
f893170085ae v6.1/standard/preempt-rt/bcm-2xxx-rpi
33338d1caf84 v6.1/standard/nxp-sdk-5.15/nxp-s32g
8916aafbd610 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
bff0a79763a5 v6.1/standard/intel-sdk-6.1/intel-socfpga
4b47a004bff8 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
986ceacea216 v6.1/standard/x86
0b3eca342987 v6.1/standard/preempt-rt/x86
a7f54a536eae v6.1/standard/sdkv6.1/xlnx-soc
a8faae7d39f2 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
3b97608591d3 v6.6/standard/sdkv5.15/axxia
fb9dc053e1a1 v6.6/standard/preempt-rt/sdkv5.15/axxia
905afc19e0b7 v6.6/standard/base
e9a711dde6d2 v6.6/standard/preempt-rt/base
f7615455d7e9 v6.6/standard/nxp-sdk-6.6/nxp-soc
98b0c8bc24c9 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
aa03a696d6ce v6.6/standard/cn-sdkv6.1/octeon
a02198c2ff2e v6.6/standard/preempt-rt/cn-sdkv6.1/octeon
c9f681e095cb v6.6/standard/nxp-sdk-6.6/nxp-s32g
fa9571d4c4d5 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
c738fcd33f55 v6.6/standard/ti-sdk-6.6/ti-soc
39958b73796b v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc
4e01f243547c v6.6/standard/sdkv6.6/xlnx-soc
#Have textual conflicts
9229c5b17ed2 v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc
#Have textual conflicts
- There are several minor merge conflicts on v5.15 branches.
- A minor merge conflict on both v6.1 and v6.6.
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 (#14117):
https://lists.yoctoproject.org/g/linux-yocto/message/14117
Mute This Topic: https://lists.yoctoproject.org/mt/107065016/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
