Hi Bruce,
This is a trial merge of the stable kernel v5.15.114 v6.1.31 for the following
branches in the linux-yocto.
d547e7f5bc0a v5.15/standard/sdkv5.10/axxia
59a34b26f323 v5.15/standard/preempt-rt/sdkv5.10/axxia
9fd769562dae v5.15/standard/base
6af1dfdecdf3 v5.15/standard/preempt-rt/base
dcd5eafbfe83 v5.15/standard/cn-sdkv5.4/octeon
9a9c3c876923 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
2d735a4173c8 v5.15/standard/cn-sdkv5.15/octeon
9d0f475b5800 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
2f11ec7e600a v5.15/standard/ti-sdk-5.10/ti-j72xx
7c1279b896b7 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
7b0a923885de v5.15/standard/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
96bac0c6e644 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
6fbe57dbd48b v5.15/standard/bcm-2xxx-rpi
13904374823f v5.15/standard/preempt-rt/bcm-2xxx-rpi
3fae05dc70d5 v5.15/standard/nxp-sdk-5.15/nxp-s32g
5fec5bd47a75 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
67d5ebb0aea3 v5.15/standard/intel-sdk-5.15/intel-socfpga
c5204957cee3 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
12d56638dcd9 v5.15/standard/x86
ed06ff93a699 v5.15/standard/preempt-rt/x86
e1bb3e6d56ac v5.15/standard/sdkv5.15/xlnx-soc
#Have textual conflicts
71df8f645502 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
#Have textual conflicts
3a87532fe22d v6.1/standard/base
6f8ae7bf93be v6.1/standard/preempt-rt/base
62b4711e14f6 v6.1/standard/ti-sdk-5.10/ti-j7xxx
0de1fa8ce944 v6.1/standard/preempt-rt/ti-sdk-5.10/ti-j7xxx
b55eebaff7ba v6.1/standard/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
a1328b32578d v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
fb623b6f0077 v6.1/standard/bcm-2xxx-rpi
7e5a05433afc v6.1/standard/preempt-rt/bcm-2xxx-rpi
027c65b58322 v6.1/standard/nxp-sdk-5.15/nxp-s32g
91878a08890f v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
3a87532fe22d v6.1/standard/x86
752cafeaa8e5 v6.1/standard/preempt-rt/x86
30e338889d7c v6.1/standard/sdkv6.1/xlnx-soc
#Have textual conflicts
638a62e0f723 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
#Have textual conflicts
This is a relatively small stable release and only has several trivial merge
conflicts.
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 (#12667):
https://lists.yoctoproject.org/g/linux-yocto/message/12667
Mute This Topic: https://lists.yoctoproject.org/mt/99231926/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
