Hi Bruce,
This is a trial merge of the stable kernel v5.15.166 v6.1.107 v6.1.108 v6.6.48
v6.6.49 for the following branches in the linux-yocto.
0efe11e72a61 v5.15/standard/sdkv5.10/axxia
9cb32e740c32 v5.15/standard/preempt-rt/sdkv5.10/axxia
21a629633251 v5.15/standard/base
783a16337777 v5.15/standard/preempt-rt/base
ebea7a1146e3 v5.15/standard/cn-sdkv5.4/octeon
dbc386ceaae5 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
fe8aa43927a1 v5.15/standard/cn-sdkv5.15/octeon
15672c74516d v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
c2cab0a9efdc v5.15/standard/ti-sdk-5.10/ti-j72xx
d2e6c0fb4a6a v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
455d0374b19d v5.15/standard/nxp-sdk-5.15/nxp-soc
54a43de3af78 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
708e713dea90 v5.15/standard/bcm-2xxx-rpi
523d5bb192d2 v5.15/standard/preempt-rt/bcm-2xxx-rpi
0353e25a33a6 v5.15/standard/nxp-sdk-5.15/nxp-s32g
b121850273ff v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
a197d0bfd1b4 v5.15/standard/intel-sdk-5.15/intel-socfpga
10b508a116dc v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
d163b243fdd7 v5.15/standard/x86
d1da3d28fe42 v5.15/standard/preempt-rt/x86
127639abcc8e v5.15/standard/sdkv5.15/xlnx-soc
#Have textual and semantic conflicts
a881fc0aed92 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
#Have textual and semantic conflicts
f3ed367cd8f6 v6.1/standard/sdkv5.10/axxia
8d0be60effd2 v6.1/standard/preempt-rt/sdkv5.10/axxia
38eb9657598d v6.1/standard/base
5f43463d41c4 v6.1/standard/preempt-rt/base
6e67c9f4c83a v6.1/standard/ti-sdk-6.1/ti-j7xxx
0e82f256a9c3 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
c703ebde091a v6.1/standard/nxp-sdk-6.1/nxp-soc
d91731cb9bc6 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
f115d9a795c3 v6.1/standard/cn-sdkv5.15/octeon
#Have textual conflicts
808e68f6c9b3 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual conflicts
725e7edff5f2 v6.1/standard/cn-sdkv6.1/octeon
#Have textual conflicts
ba7985f818cd v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
#Have textual conflicts
8673b6599097 v6.1/standard/microchip-polarfire-soc
e79fc192ef0f v6.1/standard/preempt-rt/microchip-polarfire-soc
108dec8f0d39 v6.1/standard/bcm-2xxx-rpi
#Have textual conflicts
6e1b29221ebd v6.1/standard/preempt-rt/bcm-2xxx-rpi
#Have textual conflicts
06b118c90479 v6.1/standard/nxp-sdk-5.15/nxp-s32g
8228971e796c v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
e74b0fda711a v6.1/standard/intel-sdk-6.1/intel-socfpga
fabf972b26d5 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
d2293e4f68cd v6.1/standard/x86
8c50417d0bff v6.1/standard/preempt-rt/x86
53639a1441a8 v6.1/standard/sdkv6.1/xlnx-soc
#Have textual and semantic conflicts
158d266fe8d1 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
#Have textual and semantic conflicts
6063519e1c71 v6.6/standard/sdkv5.15/axxia
33126488907d v6.6/standard/preempt-rt/sdkv5.15/axxia
c05cafc869d3 v6.6/standard/base
71b89cf84f29 v6.6/standard/preempt-rt/base
7caa215add47 v6.6/standard/nxp-sdk-6.6/nxp-soc
#Have textual conflicts
6ea808423ad3 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
#Have textual conflicts
704ae1d99ac7 v6.6/standard/cn-sdkv6.1/octeon
#Have textual conflicts
5684a11b0708 v6.6/standard/preempt-rt/cn-sdkv6.1/octeon
#Have textual conflicts
58ca433f56b3 v6.6/standard/microchip-polarfire-soc
738c4b132de7 v6.6/standard/preempt-rt/microchip-polarfire-soc
722fbca549ab v6.6/standard/bcm-2xxx-rpi
#Have textual conflicts
9d3ea04eefb7 v6.6/standard/preempt-rt/bcm-2xxx-rpi
#Have textual conflicts
7f114e31156f v6.6/standard/nxp-sdk-6.6/nxp-s32g
c2b6e8f021e7 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-s32g
4847ef106410 v6.6/standard/ti-sdk-6.6/ti-soc
3a313c15ea14 v6.6/standard/preempt-rt/ti-sdk-6.6/ti-soc
975a1d108d87 v6.6/standard/sdkv6.6/xlnx-soc
#Have textual and semantic conflicts
c3766a76a180 v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc
#Have textual and semantic conflicts
- Several minor conflicts in nxp, octeon and rpi branches.
- Please note that there are some ugly and semantic conflicts in 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 (#14361):
https://lists.yoctoproject.org/g/linux-yocto/message/14361
Mute This Topic: https://lists.yoctoproject.org/mt/108285106/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
