Re: [linux-yocto] [yocto-kernel-cache][yocto-5.15][PATCH] aptiv-s32g: change S32CC_THERMAL to QORIQ_THERMAL
Hi Bruce, On 10/2/23 11:19, Bruce Ashfield wrote: In message: [yocto-kernel-cache][yocto-5.15][PATCH] aptiv-s32g: change S32CC_THERMAL to QORIQ_THERMAL on 28/09/2023 quanyang.w...@windriver.com wrote: From: Quanyang Wang The latest SDK BSP38 RC9 drops the S32CC_THERMAL config and changes to use QORIQ_THERMAL instead, so update kernel cache to compatible with it. Signed-off-by: Quanyang Wang --- Hi Bruce, Would you please help merge this patch to the branch: yocto-5.15 merged. I can't find this patch. Would you please help to check it again? Thanks, Quanyang Bruce Thanks, Quanyang --- bsp/aptiv-s32g/aptiv-cvc.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bsp/aptiv-s32g/aptiv-cvc.cfg b/bsp/aptiv-s32g/aptiv-cvc.cfg index 14ad889b97..5f266fede3 100644 --- a/bsp/aptiv-s32g/aptiv-cvc.cfg +++ b/bsp/aptiv-s32g/aptiv-cvc.cfg @@ -119,7 +119,7 @@ CONFIG_INPUT_UINPUT=y # Thermal CONFIG_THERMAL=y -CONFIG_S32CC_THERMAL=y +CONFIG_QORIQ_THERMAL=y # ADC CONFIG_IIO=y -- 2.36.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13149): https://lists.yoctoproject.org/g/linux-yocto/message/13149 Mute This Topic: https://lists.yoctoproject.org/mt/101634503/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] Trial merge of v5.15.134 v6.1.56 for linux-yocto
Hi Bruce, This is a trial merge of the stable kernel v5.15.134 v6.1.56 for the following branches in the linux-yocto. 99381078d804 v5.15/standard/sdkv5.10/axxia 545d5344ea4b v5.15/standard/preempt-rt/sdkv5.10/axxia ca8612c8a26d v5.15/standard/base 3a27cb5275b3 v5.15/standard/preempt-rt/base 9650264f5bbf v5.15/standard/cn-sdkv5.4/octeon f7c50a5d1afd v5.15/standard/preempt-rt/cn-sdkv5.4/octeon e2ad25a0ce26 v5.15/standard/cn-sdkv5.15/octeon 68e7a9f3c3f7 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon 438f1fdd1260 v5.15/standard/ti-sdk-5.10/ti-j72xx 2d6854883f2f v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx da2b37d29939 v5.15/standard/nxp-sdk-5.15/nxp-soc 456978c3425f v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc d8b168fcfc64 v5.15/standard/bcm-2xxx-rpi dda98bc055ff v5.15/standard/preempt-rt/bcm-2xxx-rpi 41236d45f8c0 v5.15/standard/nxp-sdk-5.15/nxp-s32g f120cc714117 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 073dfaa16652 v5.15/standard/intel-sdk-5.15/intel-socfpga e6e33b3296ef v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga bd9c241b598a v5.15/standard/x86 c37502f4179a v5.15/standard/preempt-rt/x86 3da6be81c82f v5.15/standard/sdkv5.15/xlnx-soc 8e039f2e4aad v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc 838c81abb61d v6.1/standard/base c0efdc406ffc v6.1/standard/preempt-rt/base 271a527701d8 v6.1/standard/ti-sdk-6.1/ti-j7xxx 54bae75279ed v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx 67c813afa6e6 v6.1/standard/nxp-sdk-6.1/nxp-soc #Have textual conflicts ff39c0337c95 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc #Have textual conflicts 3e85c2231d53 v6.1/standard/cn-sdkv5.15/octeon #Have textual conflicts 6478615dbc36 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon #Have textual conflicts c8bf22f15b07 v6.1/standard/bcm-2xxx-rpi 010b2adb0699 v6.1/standard/preempt-rt/bcm-2xxx-rpi 1d66a5082948 v6.1/standard/nxp-sdk-5.15/nxp-s32g 9ecb1daf44d3 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 28708fa15d6f v6.1/standard/intel-sdk-6.1/intel-socfpga 4092fae46035 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga 7081e7e6a05c v6.1/standard/x86 729445ca78bf v6.1/standard/preempt-rt/x86 db5278cf4c53 v6.1/standard/sdkv6.1/xlnx-soc 3da8c3c5c190 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc In this stable release, there are only a few minor merge conflicts. 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 (#13148): https://lists.yoctoproject.org/g/linux-yocto/message/13148 Mute This Topic: https://lists.yoctoproject.org/mt/101799100/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
