Hi Bruce, This is a trial merge of the stable kernel v5.15.152 v6.1.82 for the following branches in the linux-yocto. 8441795c5d6f v5.15/standard/sdkv5.10/axxia 8242dc07ca33 v5.15/standard/preempt-rt/sdkv5.10/axxia c83b73b48974 v5.15/standard/base 0d992354aa32 v5.15/standard/preempt-rt/base de1bc32baa54 v5.15/standard/cn-sdkv5.4/octeon cd0719b53bf9 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon 1fa974505ba2 v5.15/standard/cn-sdkv5.15/octeon c799c504eac8 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon f173c9f889fa v5.15/standard/ti-sdk-5.10/ti-j72xx c80f38dd2543 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx 448957beeee6 v5.15/standard/nxp-sdk-5.15/nxp-soc 7939302b17e9 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc 8638c9a65ea1 v5.15/standard/bcm-2xxx-rpi #Have textual conflicts cfcea09b8b9c v5.15/standard/preempt-rt/bcm-2xxx-rpi 59c473545504 v5.15/standard/nxp-sdk-5.15/nxp-s32g d035368ec01a v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g c62b5d909bd4 v5.15/standard/intel-sdk-5.15/intel-socfpga 074c73c8fb65 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga 6f68051affde v5.15/standard/x86 8ea8d2415faa v5.15/standard/preempt-rt/x86 62f89ced13cc v5.15/standard/sdkv5.15/xlnx-soc 007a7d0f7e8b v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc 13f46c11e84d v6.1/standard/sdkv5.10/axxia 6b719d4ebd91 v6.1/standard/preempt-rt/sdkv5.10/axxia 77cfcdc0f431 v6.1/standard/base fb102a5fe10b v6.1/standard/preempt-rt/base 76d8795a2614 v6.1/standard/ti-sdk-6.1/ti-j7xxx caceb206db05 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx b6068c48e578 v6.1/standard/nxp-sdk-6.1/nxp-soc eb93150e3db3 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc 8e19ca547fe3 v6.1/standard/cn-sdkv5.15/octeon a9cb178d96a2 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon 3c2229b42119 v6.1/standard/microchip-polarfire-soc 9a714e926528 v6.1/standard/preempt-rt/microchip-polarfire-soc b4f069b2407d v6.1/standard/bcm-2xxx-rpi 91b2f7e6d9a7 v6.1/standard/preempt-rt/bcm-2xxx-rpi 227df9926302 v6.1/standard/nxp-sdk-5.15/nxp-s32g ebb4201875ea v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 5896799d54f7 v6.1/standard/intel-sdk-6.1/intel-socfpga 09509f3893f0 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga 007392942561 v6.1/standard/x86 22e449f4568d v6.1/standard/preempt-rt/x86 087fdda55e45 v6.1/standard/sdkv6.1/xlnx-soc 35048bcb1b5e v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
There is only minor merge conflict on v5.15 rpi branch due to re-sort the usb audio quirk tables. Please note we also need to re-sort the entries added by SDK patches. 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 (#13690): https://lists.yoctoproject.org/g/linux-yocto/message/13690 Mute This Topic: https://lists.yoctoproject.org/mt/104963163/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-