Hi Bruce, This is a trial merge of the stable kernel v5.15.159 v6.1.91 v6.6.31 for the following branches in the linux-yocto. 4556d2fec7b4 v5.15/standard/sdkv5.10/axxia 46fe25727bd4 v5.15/standard/preempt-rt/sdkv5.10/axxia 51f4984490ae v5.15/standard/base c20bf83420cf v5.15/standard/preempt-rt/base 82c0fd969254 v5.15/standard/cn-sdkv5.4/octeon 1f6c076cdce1 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon af7506072383 v5.15/standard/cn-sdkv5.15/octeon 36e718648767 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon 24fa99c45893 v5.15/standard/ti-sdk-5.10/ti-j72xx 60e489cc5ee6 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx 6d1cec18ac26 v5.15/standard/nxp-sdk-5.15/nxp-soc #Have textual and semantic conflicts 2eb83496f4a6 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc #Have textual and semantic conflicts 931b18ae176c v5.15/standard/bcm-2xxx-rpi #Have textual conflicts 12197e6c7e0e v5.15/standard/preempt-rt/bcm-2xxx-rpi 169bb537e287 v5.15/standard/nxp-sdk-5.15/nxp-s32g 954a4a8abc6a v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g f7e5c250018c v5.15/standard/intel-sdk-5.15/intel-socfpga 3dbc54136697 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga eae056c5bd20 v5.15/standard/x86 e327593f50fc v5.15/standard/preempt-rt/x86 80b17bc7f01d v5.15/standard/sdkv5.15/xlnx-soc #Have textual conflicts 1cbb4ec81348 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc #Have textual conflicts d62d911cd6a7 v6.1/standard/sdkv5.10/axxia 1039c719ce77 v6.1/standard/preempt-rt/sdkv5.10/axxia afc17d307cdf v6.1/standard/base 855c31994d45 v6.1/standard/preempt-rt/base 1e49acee6c20 v6.1/standard/ti-sdk-6.1/ti-j7xxx e39b57f8800c v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx 77cda8314d87 v6.1/standard/nxp-sdk-6.1/nxp-soc #Have textual and semantic conflicts 1da037d13c50 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc #Have textual and semantic conflicts c50f98b8e614 v6.1/standard/cn-sdkv5.15/octeon f6a8fe9bb8bd v6.1/standard/preempt-rt/cn-sdkv5.15/octeon 7b5dfd9d5f83 v6.1/standard/cn-sdkv6.1/octeon 8d22b541d331 v6.1/standard/preempt-rt/cn-sdkv6.1/octeon 002772ef5947 v6.1/standard/microchip-polarfire-soc 6c4acc49cc78 v6.1/standard/preempt-rt/microchip-polarfire-soc adbed3b62c38 v6.1/standard/bcm-2xxx-rpi #Have textual conflicts d68b11d2c681 v6.1/standard/preempt-rt/bcm-2xxx-rpi #Have textual conflicts eb9f4f871d12 v6.1/standard/nxp-sdk-5.15/nxp-s32g #Have textual conflicts 8aa6eab74fb1 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g #Have textual conflicts 153c38ead887 v6.1/standard/intel-sdk-6.1/intel-socfpga a2ef4177e263 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga 1e72fa7229b3 v6.1/standard/x86 d1dd8c7f5396 v6.1/standard/preempt-rt/x86 8d23a6e21e1f v6.1/standard/sdkv6.1/xlnx-soc #Have textual conflicts 945b4dab7b44 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc #Have textual conflicts 6536b41722d7 v6.6/standard/base ab1672a32ae7 v6.6/standard/preempt-rt/base afce9edbf7f0 v6.6/standard/nxp-sdk-6.6/nxp-soc #Have textual and semantic conflicts fb8946bd6dea v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc #Have textual and semantic conflicts
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. 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 (#13947): https://lists.yoctoproject.org/g/linux-yocto/message/13947 Mute This Topic: https://lists.yoctoproject.org/mt/106216800/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-