Hi Bruce, This is a trial merge of the stable kernel v5.15.156 v6.1.87 v6.6.28 for the following branches in the linux-yocto. 66b53490ea03 v5.15/standard/sdkv5.10/axxia 94a34cfd8fcb v5.15/standard/preempt-rt/sdkv5.10/axxia #Have textual conflicts 396572146060 v5.15/standard/base 1d2aa97b8cb7 v5.15/standard/preempt-rt/base #Have textual conflicts c51b5c5bce22 v5.15/standard/cn-sdkv5.4/octeon db7822d930bd v5.15/standard/preempt-rt/cn-sdkv5.4/octeon #Have textual conflicts f73dd715e5ca v5.15/standard/cn-sdkv5.15/octeon #Have textual conflicts 9a2ab377e362 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon #Have textual conflicts b9155afdd18c v5.15/standard/ti-sdk-5.10/ti-j72xx 35a018f7a1b9 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx #Have textual conflicts 32d3313f7f22 v5.15/standard/nxp-sdk-5.15/nxp-soc #Have textual conflicts ab679a963ebd v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc #Have textual conflicts 77702774b719 v5.15/standard/bcm-2xxx-rpi 9d1d05a93461 v5.15/standard/preempt-rt/bcm-2xxx-rpi #Have textual conflicts d63fea8ea5cf v5.15/standard/nxp-sdk-5.15/nxp-s32g 73db004c43ea v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g #Have textual conflicts c18b8896f5c1 v5.15/standard/intel-sdk-5.15/intel-socfpga 0714beb2e1a9 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga #Have textual conflicts e3cfe936647d v5.15/standard/x86 2d17ef3bf992 v5.15/standard/preempt-rt/x86 #Have textual conflicts ef3b7b9fcf96 v5.15/standard/sdkv5.15/xlnx-soc 51b33786942e v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc #Have textual conflicts d35073d78a82 v6.1/standard/sdkv5.10/axxia 62cdfcb19461 v6.1/standard/preempt-rt/sdkv5.10/axxia 64633959b793 v6.1/standard/base 6cb22d1ecd1c v6.1/standard/preempt-rt/base a985c44485ed v6.1/standard/ti-sdk-6.1/ti-j7xxx c09601b74cad v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx 2bd8d3c3841b v6.1/standard/nxp-sdk-6.1/nxp-soc #Have textual conflicts 951464338a29 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc #Have textual conflicts 3695aa8b9a39 v6.1/standard/cn-sdkv5.15/octeon #Have textual conflicts 226a11628c15 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon #Have textual conflicts 4131497c4aa5 v6.1/standard/cn-sdkv6.1/octeon #Have textual conflicts f523ae999cca v6.1/standard/preempt-rt/cn-sdkv6.1/octeon #Have textual conflicts 50e2c8b11a90 v6.1/standard/microchip-polarfire-soc fc63ca7d77aa v6.1/standard/preempt-rt/microchip-polarfire-soc afe8fdc1281f v6.1/standard/bcm-2xxx-rpi 5d8dcabfd741 v6.1/standard/preempt-rt/bcm-2xxx-rpi 53867785c5a9 v6.1/standard/nxp-sdk-5.15/nxp-s32g 563764b5f17d v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 6b1c614e9c7f v6.1/standard/intel-sdk-6.1/intel-socfpga 2db4524f1b17 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga 67585022e844 v6.1/standard/x86 6a2ab613203e v6.1/standard/preempt-rt/x86 ddbb76580cc1 v6.1/standard/sdkv6.1/xlnx-soc 859f88391b07 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc b4f8de1c9246 v6.6/standard/base 4f1420ac3576 v6.6/standard/preempt-rt/base f3858d95e19e v6.6/standard/nxp-sdk-6.6/nxp-soc #Have textual conflicts b8d6bd9c7928 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc #Have textual conflicts
This merge looks like a pretty routine upgrade, with no major conflicts. There are some minor conflicts on the v5.15 rt, octeon and nxp branches, but they're easy to fix. 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 (#13843): https://lists.yoctoproject.org/g/linux-yocto/message/13843 Mute This Topic: https://lists.yoctoproject.org/mt/105632758/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-