Hi Bruce, This is a trial merge of the stable kernel v5.15.153 v6.1.83 for the following branches in the linux-yocto. 205fb9414e6e v5.15/standard/sdkv5.10/axxia 979be40c2ae5 v5.15/standard/preempt-rt/sdkv5.10/axxia 74734259970f v5.15/standard/base bb72fca17f4f v5.15/standard/preempt-rt/base a9974f629f77 v5.15/standard/cn-sdkv5.4/octeon 035c7daab2b7 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon b74aa0a8024d v5.15/standard/cn-sdkv5.15/octeon 74297e0728f6 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon 29b806be96ce v5.15/standard/ti-sdk-5.10/ti-j72xx f01334cdb2af v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx 9e053973d336 v5.15/standard/nxp-sdk-5.15/nxp-soc 4a93d86880fd v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc e03d5d89e932 v5.15/standard/bcm-2xxx-rpi b37087646460 v5.15/standard/preempt-rt/bcm-2xxx-rpi ab3c32d818b9 v5.15/standard/nxp-sdk-5.15/nxp-s32g edc5f2992f04 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g a36ecee67619 v5.15/standard/intel-sdk-5.15/intel-socfpga eda03308ec1b v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga e4660c0705bd v5.15/standard/x86 4580de5a9dda v5.15/standard/preempt-rt/x86 ea5b0ec91334 v5.15/standard/sdkv5.15/xlnx-soc 61f2756657c7 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc 2510a62351e0 v6.1/standard/sdkv5.10/axxia 78197ec0c0cd v6.1/standard/preempt-rt/sdkv5.10/axxia d32dd2590616 v6.1/standard/base 2890500e8e88 v6.1/standard/preempt-rt/base 1c83c7f6dfd4 v6.1/standard/ti-sdk-6.1/ti-j7xxx #Have textual and semantic conflicts 546a458e9c00 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx #Have textual and semantic conflicts 0007023c27e7 v6.1/standard/nxp-sdk-6.1/nxp-soc c94ce1a29154 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc 24dd25d562cc v6.1/standard/cn-sdkv5.15/octeon #Have textual and semantic conflicts 953e77082395 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon #Have textual and semantic conflicts f4affd3d699a v6.1/standard/microchip-polarfire-soc d36420705bfe v6.1/standard/preempt-rt/microchip-polarfire-soc 2402072fe574 v6.1/standard/bcm-2xxx-rpi 8cbeb6bb9bd3 v6.1/standard/preempt-rt/bcm-2xxx-rpi d920a160b2cd v6.1/standard/nxp-sdk-5.15/nxp-s32g ed009ed30a24 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g ee963980bc2a v6.1/standard/intel-sdk-6.1/intel-socfpga 40d48601784d v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga 3361bb9de599 v6.1/standard/x86 83245bce963e v6.1/standard/preempt-rt/x86 7cab8e94e5a9 v6.1/standard/sdkv6.1/xlnx-soc 38579581e000 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
I am surprised that there are no merge conflicts on v5.15 branches, despite having over 300 patches in v5.15.153. All the merge conflicts come from v6.1.83. - The merge conflict on j7xx looks trivial, but we should note that there is semantic conflict here. We need to adjust the change in stable according to the change in the SDK. - The merge conflicts on octeon branch are quite ugly, part of the reason is that we moved the resctrl from arch/x86/kernel/cpu to fs/, and another part is the significant changes to the octeontx2 Ethernet driver caused by v6.1.83. 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 (#13740): https://lists.yoctoproject.org/g/linux-yocto/message/13740 Mute This Topic: https://lists.yoctoproject.org/mt/105175729/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-