Hi Bruce,
This is a trial merge of the stable kernel v5.15.149 v6.1.79 for the following
branches in the linux-yocto.
db86285e418d v5.15/standard/sdkv5.10/axxia
a5f452ad72bb v5.15/standard/preempt-rt/sdkv5.10/axxia
d5d1e68638a8 v5.15/standard/base
d1b7b9eb0c90 v5.15/standard/preempt-rt/base
fa758372d097 v5.15/standard/cn-sdkv5.4/octeon
#Have textual conflicts
18d408b5994c v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
#Have textual conflicts
283d0048fb04 v5.15/standard/cn-sdkv5.15/octeon
#Have textual conflicts
bdf8d4197ffc v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
#Have textual conflicts
32b5f070b8e3 v5.15/standard/ti-sdk-5.10/ti-j72xx
15b3be94acaf v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
8fd95417fffc v5.15/standard/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
2e008bb63d9f v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
a71102f40394 v5.15/standard/bcm-2xxx-rpi
e2c49820a4ec v5.15/standard/preempt-rt/bcm-2xxx-rpi
9b1555fd2b39 v5.15/standard/nxp-sdk-5.15/nxp-s32g
ee91441bc1c1 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
1ec58c9fd29a v5.15/standard/intel-sdk-5.15/intel-socfpga
9940e4ea870f v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
93345590f126 v5.15/standard/x86
21c3515a2528 v5.15/standard/preempt-rt/x86
640f3f9b8afe v5.15/standard/sdkv5.15/xlnx-soc
#Have textual conflicts
3c5f160cdb17 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
#Have textual conflicts
86220da7e708 v6.1/standard/sdkv5.10/axxia
fe3383ea8836 v6.1/standard/preempt-rt/sdkv5.10/axxia
5bb1bc063973 v6.1/standard/base
8198b7d059e3 v6.1/standard/preempt-rt/base
6a0fb4afed7d v6.1/standard/ti-sdk-6.1/ti-j7xxx
#Have textual conflicts
fead9f517893 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
#Have textual conflicts
35542cf32751 v6.1/standard/nxp-sdk-6.1/nxp-soc
9c36e64d1ac0 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
74d40ef948b4 v6.1/standard/cn-sdkv5.15/octeon
d44a926774b9 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
6492f85bee09 v6.1/standard/microchip-polarfire-soc
38e8cb4e3d64 v6.1/standard/preempt-rt/microchip-polarfire-soc
f1237925f2e9 v6.1/standard/bcm-2xxx-rpi
a9db91e46ddc v6.1/standard/preempt-rt/bcm-2xxx-rpi
0f4e803c8b93 v6.1/standard/nxp-sdk-5.15/nxp-s32g
2c77c317a6b3 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
4a2bb8d8e554 v6.1/standard/intel-sdk-6.1/intel-socfpga
a346089cddb6 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
952bfe618bef v6.1/standard/x86
22d714abcbf8 v6.1/standard/preempt-rt/x86
f112a993e4a3 v6.1/standard/sdkv6.1/xlnx-soc
b4c22c3189ad v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
v5.15.149 is a release with a long development cycle and a large number of
patches,
of course there are relatively more merge conflicts, but fortunately, none of
them
are particularly difficult to resolve. 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 (#13605):
https://lists.yoctoproject.org/g/linux-yocto/message/13605
Mute This Topic: https://lists.yoctoproject.org/mt/104544273/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
