Hi Bruce,
This is a trial merge of the stable kernel v5.15.159 v5.15.160 v6.1.91 v6.1.92
v6.6.31 v6.6.32 for the following branches in the linux-yocto.
71048115f6bc v5.15/standard/sdkv5.10/axxia
72de38604da8 v5.15/standard/preempt-rt/sdkv5.10/axxia
95258d7b1cd7 v5.15/standard/base
85a09dd69abb v5.15/standard/preempt-rt/base
144096b7e6bb v5.15/standard/cn-sdkv5.4/octeon
eeedd0ea8a41 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
3de2af0f215a v5.15/standard/cn-sdkv5.15/octeon
262aa7edc00b v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
48c64f5f90ee v5.15/standard/ti-sdk-5.10/ti-j72xx
644f57dc080e v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
4e52ba5656ed v5.15/standard/nxp-sdk-5.15/nxp-soc
b5ca29527eb1 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
4b38c86c9d72 v5.15/standard/bcm-2xxx-rpi
adf9cbba8eac v5.15/standard/preempt-rt/bcm-2xxx-rpi
1800f16c4d25 v5.15/standard/nxp-sdk-5.15/nxp-s32g
45320cac98da v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
9aafd46fde6b v5.15/standard/intel-sdk-5.15/intel-socfpga
b748eac10f46 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
757fa6419b4f v5.15/standard/x86
39fffb16b6a8 v5.15/standard/preempt-rt/x86
f4abc01b6b54 v5.15/standard/sdkv5.15/xlnx-soc
718a476fc58a v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
04fe20f000b3 v6.1/standard/sdkv5.10/axxia
f715330d4bdf v6.1/standard/preempt-rt/sdkv5.10/axxia
3cc712e9b835 v6.1/standard/base
c6148615a795 v6.1/standard/preempt-rt/base
2d6b57d03053 v6.1/standard/ti-sdk-6.1/ti-j7xxx
a620b934aa82 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
a8e0db5b5960 v6.1/standard/nxp-sdk-6.1/nxp-soc
5c3103ac22b8 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
790028953b00 v6.1/standard/cn-sdkv5.15/octeon
368d5d753ad7 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
efb8e517217a v6.1/standard/cn-sdkv6.1/octeon
36a686b3d9ce v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
d5407ed638ae v6.1/standard/microchip-polarfire-soc
c745402c3bc1 v6.1/standard/preempt-rt/microchip-polarfire-soc
ba2d9c0ba591 v6.1/standard/bcm-2xxx-rpi
66e4ec9a762b v6.1/standard/preempt-rt/bcm-2xxx-rpi
baf4dab314d1 v6.1/standard/nxp-sdk-5.15/nxp-s32g
6cdb1149cf75 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
2f98d321aaf3 v6.1/standard/intel-sdk-6.1/intel-socfpga
e0067719fad7 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
5f3a5048b548 v6.1/standard/x86
004b910cdbb0 v6.1/standard/preempt-rt/x86
2ee5f4c41819 v6.1/standard/sdkv6.1/xlnx-soc
81e91feae76c v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
f1ae4da084b7 v6.6/standard/base
f15d3750043c v6.6/standard/preempt-rt/base
a076027897f0 v6.6/standard/nxp-sdk-6.6/nxp-soc
6f9248487143 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
- For v5.15.159 v6.1.91 v6.6.31
Despite the extended stable release period and numerous patches, the merge
conflicts
were not particularly extensive. However, special attention is needed for a
semantic
conflict in the nxp branches (including v5.15, v6.1 and v6.6). To avoid a
compilation
error, we need to include "../host/xhci.h" in drivers/usb/dwc3/dwc3-imx8mp.c.
- For v5.15.160 v6.1.92 v6.6.32
There is no any merge conflict or build error.
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 (#13954):
https://lists.yoctoproject.org/g/linux-yocto/message/13954
Mute This Topic: https://lists.yoctoproject.org/mt/106308485/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
