Hi Bruce,
This is a trial merge of the stable kernel v5.15.117 v6.1.34 for the following
branches in the linux-yocto.
05cffcf3f2df v5.15/standard/sdkv5.10/axxia
4f5873a6bf1d v5.15/standard/preempt-rt/sdkv5.10/axxia
e16d2d7c6031 v5.15/standard/base
#Have textual conflicts
777a5f6a3351 v5.15/standard/preempt-rt/base
1eef497957a4 v5.15/standard/cn-sdkv5.4/octeon
b98db88bf80e v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
022f5c43c553 v5.15/standard/cn-sdkv5.15/octeon
628d5e8dd371 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
5fb27e88c14a v5.15/standard/ti-sdk-5.10/ti-j72xx
6d359a593201 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
28b3ba45bb82 v5.15/standard/nxp-sdk-5.15/nxp-soc
10d319a6b201 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
3ab2de578756 v5.15/standard/bcm-2xxx-rpi
787728acec8a v5.15/standard/preempt-rt/bcm-2xxx-rpi
492eec133ae0 v5.15/standard/nxp-sdk-5.15/nxp-s32g
e92b164b23e6 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
a00f2b18b010 v5.15/standard/intel-sdk-5.15/intel-socfpga
75ca7cb1b918 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
bf7577862e50 v5.15/standard/x86
a8469f48bae3 v5.15/standard/preempt-rt/x86
dc3ed8e0f0a4 v5.15/standard/sdkv5.15/xlnx-soc
cce57d8b7f9a v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
532abffac645 v6.1/standard/base
3857bd86ac28 v6.1/standard/preempt-rt/base
9ed0ab86a3ba v6.1/standard/ti-sdk-6.1/ti-j7xxx
39bcedf79e3f v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
bd0158681af6 v6.1/standard/nxp-sdk-6.1/nxp-soc
0ede0c514aa9 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
e65611adf611 v6.1/standard/cn-sdkv5.15/octeon
b5afbe849b6f v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
2d4f801c53db v6.1/standard/bcm-2xxx-rpi
270346ad94ad v6.1/standard/preempt-rt/bcm-2xxx-rpi
52791ce212c0 v6.1/standard/nxp-sdk-5.15/nxp-s32g
7af6096b11c2 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
1dbd46bf13ec v6.1/standard/intel-sdk-6.1/intel-socfpga
1606783b8ed5 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
532abffac645 v6.1/standard/x86
35b0ee0e5fa7 v6.1/standard/preempt-rt/x86
0c99c681ffc8 v6.1/standard/sdkv6.1/xlnx-soc
50394cb9556b v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
There is only one merge conflict on the v5.15/standard/base branch due to the
same patch
applied to both linux-yocto and stable. The changes in the 8d00b4e329b7 seems
correct.
24615a3b932a ata: ahci: fix enum constants for gcc-13
8d00b4e329b7 ata: ahci: fix enum constants for gcc-13
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 (#12772):
https://lists.yoctoproject.org/g/linux-yocto/message/12772
Mute This Topic: https://lists.yoctoproject.org/mt/99543322/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
