Hi Bruce,
This is a trial merge of the stable kernel v5.15.126 v6.1.45 for the following
branches in the linux-yocto.
41c926a2600e v5.15/standard/sdkv5.10/axxia
ea99d17ddeec v5.15/standard/preempt-rt/sdkv5.10/axxia
1863786b889c v5.15/standard/base
b8684f6a203a v5.15/standard/preempt-rt/base
06bb3203d0f0 v5.15/standard/cn-sdkv5.4/octeon
26f5c7eae8c7 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
47a72afd8c0f v5.15/standard/cn-sdkv5.15/octeon
#Have textual conflicts
80ce5bdb5221 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual conflicts
951bfe0dba00 v5.15/standard/ti-sdk-5.10/ti-j72xx
12faac84662c v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
a3fb5f19fe1b v5.15/standard/nxp-sdk-5.15/nxp-soc
dedd3ddcfd3d v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
cf1fffd9ab98 v5.15/standard/bcm-2xxx-rpi
0bd46bc04312 v5.15/standard/preempt-rt/bcm-2xxx-rpi
aa12a285391d v5.15/standard/nxp-sdk-5.15/nxp-s32g
#Have textual conflicts
8cb0cdb8793a v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
#Have textual conflicts
a14be6884013 v5.15/standard/intel-sdk-5.15/intel-socfpga
78b5411d9baa v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
406155cefb20 v5.15/standard/x86
16c7e9124dea v5.15/standard/preempt-rt/x86
36d825c29e88 v5.15/standard/sdkv5.15/xlnx-soc
5a3f7c3d57fe v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
f22dbd8663c2 v6.1/standard/base
1257a3a80e25 v6.1/standard/preempt-rt/base
77b688e7aa05 v6.1/standard/ti-sdk-6.1/ti-j7xxx
06a35539dfd0 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
e61ca2f13f5b v6.1/standard/nxp-sdk-6.1/nxp-soc
815688210f63 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
c32a28befc98 v6.1/standard/cn-sdkv5.15/octeon
#Have textual conflicts
4252f10ce6c4 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual conflicts
581710c04d29 v6.1/standard/bcm-2xxx-rpi
4aa1a2a51846 v6.1/standard/preempt-rt/bcm-2xxx-rpi
1cb4f02148f4 v6.1/standard/nxp-sdk-5.15/nxp-s32g
#Have textual and semantic conflicts
1c9a776ed930 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
#Have textual and semantic conflicts
a1dd781056dc v6.1/standard/intel-sdk-6.1/intel-socfpga
ebdf62776f12 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
5595cd68425f v6.1/standard/x86
75d25e00ac25 v6.1/standard/preempt-rt/x86
6e84707b7ada v6.1/standard/sdkv6.1/xlnx-soc
54cb5129ccb8 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
This stable release seems pretty normal. There are several merge conflicts,
but none of them seems significant. The only thing to pay attention to is
a semantic conflict in the v6.1 s32g branchs. 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 (#12967):
https://lists.yoctoproject.org/g/linux-yocto/message/12967
Mute This Topic: https://lists.yoctoproject.org/mt/100701313/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
