Commit Graph
100 Commits
Author SHA1 Message Date
Jiang Jiang Jian 7c1fd3fbbf Merge branch 'bugfix/lp_io_clock_control_revert_v6.0' into 'release/v6.0'
fix(gpio): Revert the fix for RTCIO config should be written if LPIO clk exists (v6.0)

See merge request espressif/esp-idf!47605
2026-04-20 17:55:20 +08:00
Jiang Jiang Jian fb33c54923 Merge branch 'bugfix/validate_ptk_generation_v6.0' into 'release/v6.0'
fix(esp_wifi): fail if ptk derivation fails (v6.0)

See merge request espressif/esp-idf!47691
2026-04-20 11:29:52 +08:00
Jiang Jiang Jian db22058940 Merge branch 'fix/fix_ot_cli_loop_v6.0' into 'release/v6.0'
fix(openthread): avoid ot_cli_loop busy loop by using select-based linenoise read (v6.0)

See merge request espressif/esp-idf!47313
2026-04-09 20:01:19 +08:00
Jiang Jiang Jian 9f1b780bd0 Merge branch 'fix/remove_psa_key_export_from_enhack_gen_v6.0' into 'release/v6.0'
fix(openthread): pre-export PSA key bytes in task context to fix ISR mutex crash (v6.0)

See merge request espressif/esp-idf!47370
2026-04-09 20:01:00 +08:00
Jiang Jiang Jian 2f2be4386e Merge branch 'feat/dpp_crypto_optimization_v6.0' into 'release/v6.0'
fix(esp_wifi): Changes to make DPP crypto faster (v6.0)

See merge request espressif/esp-idf!47385
2026-04-09 19:51:37 +08:00
Jiang Jiang Jian 78822efdb0 Merge branch 'bugfix/oob_read_in_continue_packet_v6.0' into 'release/v6.0'
fix(bt/bluedroid): fix ACL reassembly dropping valid continuation fragments (v6.0)

See merge request espressif/esp-idf!47378
2026-04-09 14:36:57 +08:00
Jiang Jiang Jian f690dadca8 Merge branch 'bugfix/fixed_conn_timeout_v6.0' into 'release/v6.0'
Bugfix/fixed conn timeout v6.0

See merge request espressif/esp-idf!47349
2026-04-09 11:35:59 +08:00
Jiang Jiang Jian d4bf404df6 Merge branch 'docs/c5_storage_docs_v6.0' into 'release/v6.0'
docs(storage): removed non-updated docs refs for C5 (v6.0)

See merge request espressif/esp-idf!47107
2026-04-07 16:42:14 +08:00
Jiang Jiang Jian 61f6e2720b Merge branch 'feature/bdl_nand_extensions_v6.0' into 'release/v6.0'
feat(esp_blockdev): Updated BDL documentation (v6.0)

See merge request espressif/esp-idf!47287
2026-04-07 16:42:06 +08:00
Jiang Jiang Jian c4555d2afe Merge branch 'fix/picolibc_setvbuf_ionbf_workaround_v6.0' into 'release/v6.0'
fix(esp_libc): picolibc: add workaround for setvbuf on _IONBF (v6.0)

See merge request espressif/esp-idf!47162
2026-04-07 12:01:48 +08:00
Jiang Jiang Jian 621d47f602 Merge branch 'fix/remove_rwdt_workaround_for_p4_rev3.2_v6.0' into 'release/v6.0'
change(esp_rom): remove wdt_hal_config_stage API workaround for P4 ECO7 (v6.0)

See merge request espressif/esp-idf!47169
2026-04-02 15:56:19 +08:00
Jiang Jiang Jian b563fe2766 Merge branch 'fix/esp32c61_rom_stack_addr_v6.0' into 'release/v6.0'
fix(soc): Correct the ESP32-C61 ROM stack start address (v6.0)

See merge request espressif/esp-idf!47150
2026-04-02 13:57:15 +08:00
Jiang Jiang Jian 30c30dddf3 Merge branch 'bugfix/fix_ci_issue_related_to_bss_max_idle_v6.0' into 'release/v6.0'
fix(ci): fix ci issue related to bss max idle test(backport v6.0)

See merge request espressif/esp-idf!47195
2026-04-02 11:20:13 +08:00
Jiang Jiang Jian c9dd3aca0b Merge branch 'fix/cmakev2_component_manager_disabled_v6.0' into 'release/v6.0'
fix(cmakev2): skip component manager flow when IDF_COMPONENT_MANAGER=0 (v6.0)

See merge request espressif/esp-idf!46954
2026-03-25 19:16:35 +08:00
Jiang Jiang Jian 5c2e7bbc29 Merge branch 'bugfix/fix_some_bt_coex_bugs_v6.0' into 'release/v6.0'
fix(coex): fix some esp32 coexistence bugs (Backport v6.0)

See merge request espressif/esp-idf!46970
2026-03-25 18:03:26 +08:00
Jiang Jiang Jian 14a0b9aa24 Merge branch 'fix/efuse_regs_store_operations_v6.0' into 'release/v6.0'
feat(hal): Adds half-word read/write checks for efuse (v6.0)

See merge request espressif/esp-idf!45341
2026-03-25 17:22:40 +08:00
Jiang Jiang Jian 9d3893303c Merge branch 'fix/enable_key_mgr_clk_for_efuse_key_ops_v6.0' into 'release/v6.0'
Enable Key Manager clock even for efuses-based key operations (v6.0)

See merge request espressif/esp-idf!46754
2026-03-25 16:02:08 +08:00
Jiang Jiang Jian 5793218f98 Merge branch 'bugfix/ap_5g_phy_bw_v6.0' into 'release/v6.0'
fix(wifi): Update channel bandwidth when ap adjust from 2g to 5g (v6.0)

See merge request espressif/esp-idf!46957
2026-03-24 20:43:30 +08:00
Jiang Jiang Jian bec053b825 Merge branch 'bugfix/idfci-8990_v6.0' into 'release/v6.0'
fix(bt): Fix crash due to functions not placed in IRAM(v6.0)

See merge request espressif/esp-idf!46939
2026-03-24 19:08:55 +08:00
Jiang Jiang Jian 82cded2700 Merge branch 'fix/components_for_static_analyzer_v6.0' into 'release/v6.0'
fix(ci): check all components using static analyzer (v6.0)

See merge request espressif/esp-idf!45939
2026-03-24 14:11:08 +08:00
Jiang Jiang Jian 0a2d35c816 Merge branch 'ci/update_github_permission_v6.0' into 'release/v6.0'
ci(github): update workflow permission (v6.0)

See merge request espressif/esp-idf!46928
2026-03-24 14:07:26 +08:00
Jiang Jiang Jian 1ad6fdb5b0 Merge branch 'bugfix/fix_ble_controller_emi_assert_v6.0' into 'release/v6.0'
fix(ble): Fixed BLE assert in "emi.c" when low memory (6.0)

See merge request espressif/esp-idf!46915
2026-03-24 11:01:13 +08:00
Jiang Jiang Jian 8cde477cc3 Merge branch 'feat/add_bluedroid_cancel_open_api_v6.0' into 'release/v6.0'
feat(ble/bluedroid): Added cancel open function for bluedroid (6.0)

See merge request espressif/esp-idf!46902
2026-03-24 10:59:20 +08:00
Jiang Jiang Jian d84bfab4b5 Merge branch 'fix/esp_idf_p4_uart_wakeupmode0_v6.0' into 'release/v6.0'
change(example): change uart wakeup mode 0 edge threshold(v6.0)

See merge request espressif/esp-idf!46374
2026-03-24 10:56:08 +08:00
Jiang Jiang Jian 484cf8f97d Merge branch 'fix/fix_bluedroid_gattc_gatts_coex_example_params_error_v6.0' into 'release/v6.0'
fix(ble/bluedroid): Fixed Incorrect use of event parameters in gattc_gatts_coex (6.0)

See merge request espressif/esp-idf!46907
2026-03-24 10:36:43 +08:00
Jiang Jiang Jian bc7219dfe7 Merge branch 'change/added_mspi_str_odd_divider_check_v6.0' into 'release/v6.0'
mspi: added sdr divider check to be not odd divider (v6.0)

See merge request espressif/esp-idf!46869
2026-03-24 10:31:23 +08:00
Jiang Jiang Jian 424a9a8c0d Merge branch 'bugfix/add_pvt_enable_flag_in_pvt_func_v6.0' into 'release/v6.0'
feat(pvt): add pvt enable flag & change pvt limit & sleep adapt time on release v6.0

See merge request espressif/esp-idf!46808
2026-03-24 10:30:43 +08:00
Jiang Jiang Jian 94ace905b9 Merge branch 'feature/update_gdbstub_v6.0' into 'release/v6.0'
gdbstub: backport fixes (v6.0)

See merge request espressif/esp-idf!46200
2026-03-24 10:28:23 +08:00
Jiang Jiang Jian b3ded45e2d Merge branch 'fix/psram_core_clk_enable_v6.0' into 'release/v6.0'
fix(mspi): enable PSRAM core clock in module clock init (v6.0)

See merge request espressif/esp-idf!46848
2026-03-23 20:17:17 +08:00
Jiang Jiang Jian e31e4c1429 Merge branch 'bugfix/oob_in_avrc_v6.0' into 'release/v6.0'
backport for fix of bug bounty. (v6.0)

See merge request espressif/esp-idf!46836
2026-03-23 16:28:52 +08:00
Jiang Jiang Jian 9cdd5ebcee Merge branch 'feature/refactor_linker_scripts_v6.0' into 'release/v6.0'
feat(esp_system): refactor linker scripts to reduce duplicated code (v6.0)

See merge request espressif/esp-idf!45728
2026-03-23 14:01:02 +08:00
Jiang Jiang Jian cdfa6ac69f Merge branch 'feat/sae_calculation_optimizations_v6.0' into 'release/v6.0'
fix(esp_wifi): Optimize crypto operations for SAE (v6.0)

See merge request espressif/esp-idf!46844
2026-03-23 14:00:51 +08:00
Jiang Jiang Jian f155b74ae4 Merge branch 'bugfix/fix_hplpgap_assert_in_pvt_func_v6.0' into 'release/v6.0'
feat(pvt): fix hplpgap assert error in pvt func on release v6.0

See merge request espressif/esp-idf!46798
2026-03-23 12:18:22 +08:00
Jiang Jiang Jian b528ef46b6 Merge branch 'fix/ci_wifi_unit_test_6.0' into 'release/v6.0'
ci: fix wifi unit test nvs_config

See merge request espressif/esp-idf!46866
2026-03-23 12:16:23 +08:00
Jiang Jiang Jian 8c0ab5ce39 Merge branch 'bugfix/esp_task_wdt_v6.0' into 'release/v6.0'
fix(esp_system): Handle failures correctly in esp_task_wdt_reconfigure() (backport v6.0)

See merge request espressif/esp-idf!45897
2026-03-23 11:22:04 +08:00
Jiang Jiang Jian b3e7406c39 Merge branch 'bugfix/backport_some_wifi_fixes_v6.0' into 'release/v6.0'
fix(wifi): backport some wifi fixes v6.0

See merge request espressif/esp-idf!46842
2026-03-23 10:50:34 +08:00
Jiang Jiang Jian 81daeadf9f Merge branch 'esp32h4_debug_asistant_v6.0' into 'release/v6.0'
feat(esp32h4): add assist_debug/bus_monitor support (v6.0)

See merge request espressif/esp-idf!45949
2026-03-23 10:38:51 +08:00
Jiang Jiang Jian 89b9317232 Merge branch 'bugfix/fix_coex_sync_filter_and_delay_issue_v6.0' into 'release/v6.0'
fix(coex): fix coex sync filter and delay issue

See merge request espressif/esp-idf!46831
2026-03-23 10:34:07 +08:00
Jiang Jiang Jian 897f50dbf2 Merge branch 'feat/bt_distance_test_v6.0' into 'release/v6.0'
feat(bt): Add APIs to read ACL real RSSI and read/write tx power of inq/iscan/page/pscan/ACL (v6.0)

See merge request espressif/esp-idf!46643
2026-03-23 10:31:10 +08:00
Jiang Jiang Jian 7fb69168e4 Merge branch 'fix/malloc_cap_iram_8bit_access_in_loop_v6.0' into 'release/v6.0'
fix(esp32): Fix access to MALLOC_CAP_IRAM_8BIT byte array in loop (v6.0)

See merge request espressif/esp-idf!46418
2026-03-23 10:31:04 +08:00
Jiang Jiang Jian 6072079026 Merge branch 'fix/roam_scan_ongoing_flag_set_v6.0' into 'release/v6.0'
Set and unset roam scan ongoing flag properly(v6.0)

See merge request espressif/esp-idf!46185
2026-03-21 17:01:40 +08:00
Jiang Jiang Jian 4d9c8f3064 Merge branch 'feature/improve_ulp_delay_api_v6.0' into 'release/v6.0'
feat(ulp): Improved ULP delay accuracy and removed floating point operations (v6.0)

See merge request espressif/esp-idf!46423
2026-03-21 14:32:29 +08:00
Jiang Jiang Jian 601c1d0f0e Merge branch 'bugfix/pm-673_v6.0' into 'release/v6.0'
backport v6.0: fix analog i2c master race cause by phy retention link

See merge request espressif/esp-idf!46435
2026-03-21 14:32:20 +08:00
Jiang Jiang Jian 000c5df203 Merge branch 'fix/fix_phy_update_failure_on_c2_6.0' into 'release/v6.0'
Fix/fix phy update failure on c2 6.0

See merge request espressif/esp-idf!46797
2026-03-21 14:23:11 +08:00
Jiang Jiang Jian 85db04992a Merge branch 'fix/fix_esp32_int_wdt_workaround_break_sleep_process_v6.0' into 'release/v6.0'
fix(esp_system): disable esp32 cache livelock int_wdt workaround in ipc_isr_stall (v6.0)

See merge request espressif/esp-idf!46741
2026-03-21 14:11:21 +08:00
Jiang Jiang Jian aca3ee3633 Merge branch 'feature/add_data_partition_secure_boot_verification_v6.0' into 'release/v6.0'
feat(secure_boot): adds api to verify data partition integrity (v6.0)

See merge request espressif/esp-idf!46428
2026-03-21 14:10:46 +08:00
Jiang Jiang Jian 637d6645eb Merge branch 'bugfix/sae_commit_queue_full_memory_leak_v6.0' into 'release/v6.0'
fix(wpa_supplicant): fix memory leak on SAE commit queue post failure (Backport v6.0)

See merge request espressif/esp-idf!46306
2026-03-21 14:09:23 +08:00
Jiang Jiang Jian ca95f699ad Merge branch 'feat/update_wifi_iperf_example_v6.0' into 'release/v6.0'
Feat: update wifi iperf example v6.0

See merge request espressif/esp-idf!46083
2026-03-21 14:08:09 +08:00
Jiang Jiang Jian 329ed7ddce Merge branch 'fix/ble_mesh_bug_report_v6.0' into 'release/v6.0'
Fix/ble mesh bug report (v6.0)

See merge request espressif/esp-idf!46101
2026-03-20 16:42:08 +08:00
Jiang Jiang Jian 50cae2f7b1 Merge branch 'bugfix/wps_disable_stop_scan_v6.0' into 'release/v6.0'
fix(wifi): Stop scan when wps is disabled (v6.0)

See merge request espressif/esp-idf!46319
2026-03-20 16:39:30 +08:00
Jiang Jiang Jian 2aaad17dc7 Merge branch 'fix/f_getfree_crash_issue_v6.0' into 'release/v6.0'
fix(fatfs): fix f_getfree crash when volume not mounted or mount failed (v6.0)

See merge request espressif/esp-idf!46716
2026-03-20 16:38:21 +08:00
Jiang Jiang Jian cdcb4cbce8 Merge branch 'ci/esp_tee_fixes_v6.0' into 'release/v6.0'
feat(esp_tee): Miscellaneous fixes and improvements (v6.0)

See merge request espressif/esp-idf!46800
2026-03-20 14:47:23 +08:00
Jiang Jiang Jian f99faef51d Merge branch 'feat/support_bleqabr25_1521_v6.0' into 'release/v6.0'
feat(ble/bluedroid): Add an API to resolve RPA (v6.0)

See merge request espressif/esp-idf!46500
2026-03-20 11:22:55 +08:00
Jiang Jiang Jian 93c374f011 Merge branch 'bugfix/ws-transport-buffer-timeout-v6.0' into 'release/v6.0'
fix(ws_transport): fix WebSocket buffer overflow and timeout handling

See merge request espressif/esp-idf!46568
2026-03-20 11:21:48 +08:00
Jiang Jiang Jian d4d8e293aa Merge branch 'docs/fatfs_change_of_defaults_v6.0' into 'release/v6.0'
docs(storage): Update migration guide (v6.0)

See merge request espressif/esp-idf!46713
2026-03-20 11:15:33 +08:00
Jiang Jiang Jian 4f5a2b9e34 Merge branch 'bugfix/wps_deauth_during_scan_v6.0' into 'release/v6.0'
fix(wifi): ignore disconnect events outside WPS handshake phase in wps (Backport v6.0)

See merge request espressif/esp-idf!46769
2026-03-20 11:04:02 +08:00
Jiang Jiang Jian b556757c94 Merge branch 'refactor/fatfs_vfs_change_esp_vfs_fat_register_prototype_v6.0' into 'release/v6.0'
refactor(fatfs): Update esp_vfs_fat_register function prototype (v6.0)

See merge request espressif/esp-idf!45980
2026-03-20 10:55:02 +08:00
Jiang Jiang Jian 9bf6972f2b Merge branch 'fix/sdmmc_sdspi_retry_crc_check_v6.0' into 'release/v6.0'
fix(sdspi): 0x106 error during SD card init via SPI related fixes (v6.0)

See merge request espressif/esp-idf!45691
2026-03-20 10:51:38 +08:00
Jiang Jiang Jian 8b4c344ddd Merge branch 'fix/vfs_missing_va_end_v6.0' into 'release/v6.0'
fix(storage/vfs): Remove va_end leak in ioctl caused by early return in macro (v6.0)

See merge request espressif/esp-idf!45521
2026-03-20 10:50:03 +08:00
Jiang Jiang Jian fcd9cd1bb9 Merge branch 'feat/delete_content_length_header_with_transfer_encoding_v6.0' into 'release/v6.0'
fix(esp_http_client): delete Content-Length header when using Transfer-Encoding (v6.0)

See merge request espressif/esp-idf!46683
2026-03-20 10:47:57 +08:00
Jiang Jiang Jian 83c3c25a45 Merge branch 'bugfix/fix_call_spp_start_discovert_twice_crash_v6.0' into 'release/v6.0'
fix(bt): fix crash when calling esp_spp_start_discovery twice in succession(v6.0)

See merge request espressif/esp-idf!46664
2026-03-20 10:47:42 +08:00
Jiang Jiang Jian 7a9362c9c8 Merge branch 'fix/cmake_flags_passing_to_external_project_v6.0' into 'release/v6.0'
fix(build): fix passing CMAKE_<LANG>_FLAGS from ExternalProject_Add (v6.0)

See merge request espressif/esp-idf!46651
2026-03-20 10:47:26 +08:00
Jiang Jiang Jian 4a7655ae67 Merge branch 'docs/update_echoear_to_esp_vocat_v6.0' into 'release/v6.0'
docs: update echoear to esp-vocat

See merge request espressif/esp-idf!46635
2026-03-20 10:47:01 +08:00
Jiang Jiang Jian 5d0b18edb9 Merge branch 'fix/picolibc-specs-drop-gc-sections_v6.0' into 'release/v6.0'
fix(esp_libc): remove --gc-sections from picolibc.specs for CMake checks (v6.0)

See merge request espressif/esp-idf!46574
2026-03-20 10:46:55 +08:00
Jiang Jiang Jian b32f2828aa Merge branch 'fix/remove_unused_psa_migration_code_http_server_v6.0' into 'release/v6.0'
Fix/remove unused psa migration code http server (v6.0)

See merge request espressif/esp-idf!46558
2026-03-20 10:46:35 +08:00
Jiang Jiang Jian 9368b3c1ba Merge branch 'docs/update_unit_test_v6.0' into 'release/v6.0'
docs: Add related documentation for unit test (v6.0)

See merge request espressif/esp-idf!46442
2026-03-20 10:41:02 +08:00
Jiang Jiang Jian 1aba789643 Merge branch 'fix/flaky_test_with_memory_leak_v6.0' into 'release/v6.0'
fix(esp_system): Fix flaky tests with memory leak in sleep test (v6.0)

See merge request espressif/esp-idf!46415
2026-03-20 10:40:05 +08:00
Jiang Jiang Jian d6000ccecd Merge branch 'feat/use_common_config_to_sel_crypt_lib_v6.0' into 'release/v6.0'
Feat/use common config to sel crypt lib (v6.0)

See merge request espressif/esp-idf!46408
2026-03-20 10:39:59 +08:00
Jiang Jiang Jian c2dec1e7e2 Merge branch 'feature/update-openocd-to-v0.12.0-esp32-20260304_v6.0' into 'release/v6.0'
feat(tools): update openocd version to v0.12.0-esp32-20260304 (v6.0)

See merge request espressif/esp-idf!46363
2026-03-20 10:39:33 +08:00
Jiang Jiang Jian bea959e55f Merge branch 'bugfix/fix_kconfig_for_ble_cte_depends_v6.0' into 'release/v6.0'
bugfix(ble): remove BT_LE_SECURITY_ENABLE dependency for CTE on ESP32-C5 (v6.0)

See merge request espressif/esp-idf!46342
2026-03-20 10:39:26 +08:00
Jiang Jiang Jian edf0bf67de Merge branch 'fix/use_apb_max_state_for_ble_events_v6.0' into 'release/v6.0'
fix(ble): use apb max state for bt and enable should skip (v6.0)

See merge request espressif/esp-idf!46334
2026-03-20 10:39:19 +08:00
Jiang Jiang Jian 77d11e6381 Merge branch 'fix/ble_hci_log_direction_v6.0' into 'release/v6.0'
feat(ble_log): encode HCI direction in ble_log pipeline (v6.0)

See merge request espressif/esp-idf!46303
2026-03-20 10:38:49 +08:00
Jiang Jiang Jian 7908812022 Merge branch 'bugfix/fix_blufi_nimble_gatt_pkt_v6.0' into 'release/v6.0'
fix(blufi): Handle flattened ATT write payloads correctly in NimBLE BLUFI host (v6.0)

See merge request espressif/esp-idf!46260
2026-03-20 10:38:43 +08:00
Jiang Jiang Jian ea5e61dba8 Merge branch 'bugfix/support_for_alt_snounce_v6.0' into 'release/v6.0'
fix(esp_wifi): Add alt snonce verification in softAP (v6.0)

See merge request espressif/esp-idf!46249
2026-03-20 10:38:26 +08:00
Jiang Jiang Jian c9daea6b54 Merge branch 'feat/improve_ws_server_handshake_handling_v6.0' into 'release/v6.0'
feat(http_server): improve websocket server handling (v6.0)

See merge request espressif/esp-idf!46247
2026-03-20 10:38:23 +08:00
Jiang Jiang Jian 4922d627cd Merge branch 'feat/ble_bluedroid_log_full_compression_enable_v6.0' into 'release/v6.0'
feat(ble_mesh): enable log full compression function for bluedroid host (v6.0)

See merge request espressif/esp-idf!46156
2026-03-20 10:37:19 +08:00
Jiang Jiang Jian e4caa65b0b Merge branch 'fix/ble_mesh_nimble_connection_failed_v6.0' into 'release/v6.0'
fix(ble_mesh):fixed nimble connection failed (v6.0)

See merge request espressif/esp-idf!46118
2026-03-20 10:37:10 +08:00
Jiang Jiang Jian 00fca66b48 Merge branch 'fix/apptrace_rb_init_v6.0' into 'release/v6.0'
fix(app_trace): Fix warning in ring buffer initialization (v6.0)

See merge request espressif/esp-idf!46063
2026-03-20 10:36:21 +08:00
Jiang Jiang Jian 0740f405aa Merge branch 'docs/update_translation_for_security_v6.0' into 'release/v6.0'
docs: Update CN translation for pthread (v6.0)

See merge request espressif/esp-idf!46057
2026-03-20 10:36:18 +08:00
Jiang Jiang Jian 37580eaf5d Merge branch 'fix/c61_wp_bp_nums_v6.0' into 'release/v6.0'
Fix number of available BPs/WPs for esp32c61 (v6.0)

See merge request espressif/esp-idf!46032
2026-03-20 10:35:51 +08:00
Jiang Jiang Jian 780907b01e Merge branch 'fix/p4_120_suspened_v6.0' into 'release/v6.0'
fix(spi_flash): Fix esp32p4 120m flash suspend failed (backport v6.0)

See merge request espressif/esp-idf!46045
2026-03-20 10:35:05 +08:00
Jiang Jiang Jian d8c022123d Merge branch 'fix/ai_idf_ver_fallback_when_no_git_v6.0' into 'release/v6.0'
fix(cmake): Fall back to version from components when git describe fails (v6.0)

See merge request espressif/esp-idf!46027
2026-03-20 10:34:25 +08:00
Jiang Jiang Jian 88e7db86d5 Merge branch 'contrib/github_pr_18241_v6.0' into 'release/v6.0'
fix(esp_https_server): SSL context leak when HTTPS server fails to start (GitHub PR) (v6.0)

See merge request espressif/esp-idf!45988
2026-03-20 10:33:57 +08:00
Jiang Jiang Jian 45f2afa1cd Merge branch 'update/spiffs_sync_upstream_6.0' into 'release/v6.0'
change(spiffs): upgrade spiffs module to 0.2-265-gad902ca version (v6.0)

See merge request espressif/esp-idf!45968
2026-03-20 10:33:25 +08:00
Jiang Jiang Jian ea413ed78b Merge branch 'fix/minimal_build_no_main_v6.0' into 'release/v6.0'
fix(build): ensure the main component exists when MINIMAL_BUILD is enabled (v6.0)

See merge request espressif/esp-idf!45915
2026-03-20 10:32:22 +08:00
Jiang Jiang Jian 2676490557 Merge branch 'feat/fix_esp32c2_rom_rewrite_issue_rebase_v6.0' into 'release/v6.0'
Feat/fix esp32c2 rom rewrite issue rebase (v6.0)

See merge request espressif/esp-idf!45769
2026-03-20 10:30:46 +08:00
Jiang Jiang Jian 95d8c4f9b3 Merge branch 'fix/ble_mesh_blob_issue_fix_v6.0' into 'release/v6.0'
fix(ble_mesh): Miscellaneous fixes for blob (v6.0)

See merge request espressif/esp-idf!45761
2026-03-20 10:30:39 +08:00
Jiang Jiang Jian 45c16074d2 Merge branch 'test/reenable_custom_flash_example_build_v6.0' into 'release/v6.0'
test(spi_flash): re-enable custom_flash_driver example build test (v6.0)

See merge request espressif/esp-idf!45739
2026-03-20 10:30:19 +08:00
Jiang Jiang Jian 9b9dc79038 Merge branch 'change/ble_update_lib_20260127_v6.0' into 'release/v6.0'
change(ble): [AUTO_MR] 20260127 - Update ESP BLE Controller Lib (v6.0)

See merge request espressif/esp-idf!45678
2026-03-20 10:26:31 +08:00
Jiang Jiang Jian f9c5aa927f Merge branch 'fix/esp_partition_blockdev_sizes_v6.0' into 'release/v6.0'
fix(storage/partition): Update sizes in blockdev geometry in read-only mode for compatibility (v6.0)

See merge request espressif/esp-idf!45695
2026-03-20 10:22:59 +08:00
Jiang Jiang Jian e11bcf3ed0 Merge branch 'bugifx/optimize_some_bluedroid_code_v6.0' into 'release/v6.0'
Bugifx/optimize some bluedroid code v6.0

See merge request espressif/esp-idf!45561
2026-03-20 10:22:37 +08:00
Jiang Jiang Jian 208229bbf8 Merge branch 'fix/restore_ble_mesh_c5_c61_v6.0' into 'release/v6.0'
Fix/restore ble mesh c5 c61 (v6.0)

See merge request espressif/esp-idf!45539
2026-03-20 10:22:32 +08:00
Jiang Jiang Jian 8c07347e74 Merge branch 'fix/fatfs_test_apps_remove_esp32c3_from_sdcard_sdmode_test_v6.0' into 'release/v6.0'
fix(fatfs): fatfs test_apps remove esp32c3 from sdcard_sdmode test (v6.0)

See merge request espressif/esp-idf!45497
2026-03-20 10:22:22 +08:00
Jiang Jiang Jian 4a917da883 Merge branch 'bugfix/security_fixes_for_examples_v6.0' into 'release/v6.0'
fix(nimble): Fix vulnerabilities in NimBLE examples (v6.0)

See merge request espressif/esp-idf!45480
2026-03-20 10:22:12 +08:00
Jiang Jiang Jian 56ca3805b2 Merge branch 'feature/add_fopencookie_implementation_v6.0' into 'release/v6.0'
feat(esp_libc): picolibc: add fopencookie implementation (v6.0)

See merge request espressif/esp-idf!45431
2026-03-20 10:21:53 +08:00
Jiang Jiang Jian ed452deeb7 Merge branch 'docs/update_cn_translation_for_storage_v6.0' into 'release/v6.0'
docs: Update translation for storage.rst (v6.0)

See merge request espressif/esp-idf!45408
2026-03-20 10:21:49 +08:00
Jiang Jiang Jian cd0d78f9aa Merge branch 'fix/example_sd_card_pytest_wrong_timeout_v6.0' into 'release/v6.0'
fix(examples): Fixed wrong timeout placement in examples/sd_card/* pytest (v6.0)

See merge request espressif/esp-idf!45029
2026-03-20 10:21:36 +08:00
Jiang Jiang Jian 6c1ab48431 Merge branch 'fix/coredump_test_tcb_corrupted_v6.0' into 'release/v6.0'
test(espcoredump): fix test for corrupted TCB handling in coredump (v6.0)

See merge request espressif/esp-idf!44834
2026-03-20 10:21:26 +08:00
Jiang Jiang Jian 9550ecc703 Merge branch 'change/hfp_hf_example_v6.0' into 'release/v6.0'
change(bt/examples): Add the use of internal codec APIs in the hfp_hf example (v6.0)

See merge request espressif/esp-idf!46482
2026-03-20 10:20:50 +08:00
Jiang Jiang Jian 45502b34f1 Merge branch 'bugfix/report_hid_close_evt_v6.0' into 'release/v6.0'
fix(hid): Fixed HID repeatedly reporting the close event (v6.0)

See merge request espressif/esp-idf!46610
2026-03-20 10:18:03 +08:00