Commit Graph
100 Commits
Author SHA1 Message Date
Jiang Jiang Jian ae42d2cf67 Merge branch 'bugfix/fix_bluedroid_find_info_format_mismatch_v6.1' into 'release/v6.1'
fix(ble/bluedroid): restore find info PDU stop on UUID format mismatch (6.1)

See merge request espressif/esp-idf!52081
2026-08-31 11:46:57 +08:00
Jiang Jiang Jian 83d0478bb6 Merge branch 'docs/clarify-storage-example-readmes_v6.1' into 'release/v6.1'
docs(storage): clarify example READMEs and when to use each (v6.1)

See merge request espressif/esp-idf!52037
2026-08-31 11:45:43 +08:00
Jiang Jiang Jian c48688459e Merge branch 'contrib/github_pr_18960_v6.1' into 'release/v6.1'
Fix default value type of FATFS_PRINT_LLI and FATFS_PRINT_FLOAT (GitHub PR) (v6.1)

See merge request espressif/esp-idf!51906
2026-08-31 11:43:06 +08:00
Jiang Jiang Jian 49a9cd1840 Merge branch 'fix/fix_esp32s31_stuck_in_phy_disable_v6.1' into 'release/v6.1'
fix(esp_hw_support): fix esp32s31 stuck in phy_disable if mdoem module is not initialized (v6.1)

See merge request espressif/esp-idf!51897
2026-08-31 11:42:57 +08:00
Jiang Jiang Jian 37b14abc99 Merge branch 'fix/fatfs-vfs-fcntl-setfl_v6.1' into 'release/v6.1'
fix(fatfs): preserve access mode in VFS F_SETFL (v6.1)

See merge request espressif/esp-idf!51885
2026-08-31 11:42:11 +08:00
Jiang Jiang Jian 6009c8ba4e Merge branch 'bugfix/nvs-cxx-handle-docs_v6.1' into 'release/v6.1'
docs(nvs_flash): add C++ NVS handle API documentation (v6.1)

See merge request espressif/esp-idf!51816
2026-08-31 11:41:15 +08:00
Jiang Jiang Jian 98f0d3693e Merge branch 'feat/support_multipan_feature_rcp_20260603_v6.1' into 'release/v6.1'
feat(openthread): support multipan feature for RCP (v6.1)

See merge request espressif/esp-idf!51777
2026-08-31 11:40:43 +08:00
Jiang Jiang Jian 2c72896139 Merge branch 'bugfix/l2tap-test-errno-v6.1' into 'release/v6.1'
test(esp_netif): clear errno before L2TAP asserts v6.1

See merge request espressif/esp-idf!51760
2026-08-31 11:40:41 +08:00
Jiang Jiang Jian 904f586487 Merge branch 'feat/add_openthread_s31_ci_case_v6.1' into 'release/v6.1'
ci: add openthread s31 ci case (v6.1)

See merge request espressif/esp-idf!51632
2026-08-31 11:37:28 +08:00
Jiang Jiang Jian c95ce33619 Merge branch 'fix/heap_trace_stack_corruption_v6.1' into 'release/v6.1'
fix(heap): avoid stack smash when heap tracing stack depth is 0 (v6.1)

See merge request espressif/esp-idf!51520
2026-08-31 11:32:02 +08:00
Jiang Jiang Jian b979cf26d0 Merge branch 'fix/ble_mesh_added_gatt_err_rsp_v6.1' into 'release/v6.1'
fix(ble_mesh): align GATTS read/write response handling with ATT (6.1)

See merge request espressif/esp-idf!51464
2026-08-31 11:29:21 +08:00
Jiang Jiang Jian f49907ddb1 Merge branch 'contrib/github_pr_18815_v6.1' into 'release/v6.1'
Fix minor issues in sd (GitHub PR) (v6.1)

See merge request espressif/esp-idf!51435
2026-08-31 11:28:28 +08:00
Jiang Jiang Jian c0b6759e93 Merge branch 'idf/ble_audio_pts_v6.1' into 'release/v6.1'
feat(ble_audio): Miscellaneous update for verifying with PTS cases (v6.1)

See merge request espressif/esp-idf!51421
2026-08-31 11:28:03 +08:00
Jiang Jiang Jian 6948f11dfe Merge branch 'fix/resolve_issues_reported_via_bbp_v6.1' into 'release/v6.1'
fix(openthread): fix null pointer deref, uninitialized struct, and unbounded strcpy in spinel/RCP code (v6.1)

See merge request espressif/esp-idf!51370
2026-08-31 11:27:19 +08:00
Jiang Jiang Jian 747b623aba Merge branch 'fix/154_mac_receive_at_v6.1' into 'release/v6.1'
fix(ieee802154): skip receive_at when rx window already expired (v6.1)

See merge request espressif/esp-idf!51364
2026-08-31 11:26:45 +08:00
Jiang Jiang Jian e045076539 Merge branch 'bugfix/nvs-deinit-open-handle-leak_v6.1' into 'release/v6.1'
fix(nvs_flash): delete leftover handles on partition deinit (v6.1)

See merge request espressif/esp-idf!51354
2026-08-31 11:26:26 +08:00
Jiang Jiang Jian 0773a8d8bb Merge branch 'bugfix/idfci-12815-12072-timeout_v6.1' into 'release/v6.1'
fix(storage): mark storage pytest apps flaky in CI (v6.1)

See merge request espressif/esp-idf!51333
2026-08-31 11:26:18 +08:00
Jiang Jiang Jian 880b0b1f67 Merge branch 'fix/fix_some_ble_sleep_issues_v6.1' into 'release/v6.1'
Fix/fix some ble sleep issues (6.1)

See merge request espressif/esp-idf!51320
2026-08-31 11:26:01 +08:00
Jiang Jiang Jian fe321e73c8 Merge branch 'feature/enable_zc_extension_for_esp32s31_v6.1' into 'release/v6.1'
feat(soc): esp32s31 enable zc* extension (v6.1)

See merge request espressif/esp-idf!51324
2026-08-31 11:25:39 +08:00
Jiang Jiang Jian ba9c7f6e2b Merge branch 'fix/provide-picolibc-timespec_get_v6.1' into 'release/v6.1'
fix(esp_libc): Provide timespec_get missing from the picolibc toolchain (v6.1)

See merge request espressif/esp-idf!51285
2026-08-31 11:24:38 +08:00
Jiang Jiang Jian 76805236ee Merge branch 'fix/ble_log_compression_issue_on_windows_v6.1' into 'release/v6.1'
fix(bt): fix BLE log compression build on Windows (6.1)

See merge request espressif/esp-idf!51247
2026-08-31 11:23:51 +08:00
Jiang Jiang Jian 2f454fdffd Merge branch 'feat/add_ble_50_protocomm_v6.1' into 'release/v6.1'
feat(protocomm): Add support for BLE 5 for bluedroid (v6.1)

See merge request espressif/esp-idf!51226
2026-08-31 11:17:11 +08:00
Jiang Jiang Jian 127053ab8d Merge branch 'feat/update_mesh_lib_to_supported_get_lib_ver_v6.1' into 'release/v6.1'
Feat/update mesh lib to supported get lib ver (6.1)

See merge request espressif/esp-idf!51174
2026-08-31 11:15:03 +08:00
Jiang Jiang Jian c063744e22 Merge branch 'support/ot_register_154_event_cb_v6.1' into 'release/v6.1'
feat(openthread): use ieee802154 event callback list instead of weak overrides (v6.1)

See merge request espressif/esp-idf!51126
2026-08-31 11:14:33 +08:00
Jiang Jiang Jian 5ca2597430 Merge branch 'fix/ble_hidd_remove_ccc_gating_v6.1' into 'release/v6.1'
fix(esp_hid/bluedroid): remove app-layer CCC gating in HID device (6.1)

See merge request espressif/esp-idf!51008
2026-08-31 11:13:50 +08:00
Jiang Jiang Jian 1c220a2399 Merge branch 'change/ble_update_lib_20260717_v6.1' into 'release/v6.1'
change(ble): [AUTO_MR] 20260717 - Update ESP BLE Controller Lib (6.1)

See merge request espressif/esp-idf!50933
2026-08-31 11:13:18 +08:00
Jiang Jiang Jian 319258d587 Merge branch 'bugfix/parttool-serial-handoff_v6.1' into 'release/v6.1'
fix(storage): stabilize parttool pytest serial handoff (v6.1)

See merge request espressif/esp-idf!50912
2026-08-31 11:12:53 +08:00
Jiang Jiang Jian d6da4da7d3 Merge branch 'bugfix/sdmmc-ddr-response-buffer-leak_v6.1' into 'release/v6.1'
fix(sdmmc): free DMA response buffer on DDR mode switch failure (v6.1)

See merge request espressif/esp-idf!50885
2026-08-31 11:12:34 +08:00
Jiang Jiang Jian aa98c93718 Merge branch 'feat/optimize_for_esp32h4_light_sleep_ble_current_v6.1' into 'release/v6.1'
Feat/optimize for esp32h4 light sleep ble current (6.1)

See merge request espressif/esp-idf!50789
2026-08-31 11:11:41 +08:00
Jiang Jiang Jian 37ae031039 Merge branch 'feature/enable_zb_for_esp32p4_v6.1' into 'release/v6.1'
feat(soc): enable zb* extensions for esp32p4 greater v3 (v6.1)

See merge request espressif/esp-idf!50778
2026-08-31 11:09:40 +08:00
Jiang Jiang Jian e8bc6e4385 Merge branch 'feat/support_bluedroid_le_coc_and_eatt_v6.1' into 'release/v6.1'
feat(ble/bluedroid): Support bluedroid LE COC and EATT features (6.1)

See merge request espressif/esp-idf!50716
2026-08-31 11:07:59 +08:00
Jiang Jiang Jian 89dea7df57 Merge branch 'ble-log-console-migration-notice_v6.1' into 'release/v6.1'
Ble log console repository migration (6.1)

See merge request espressif/esp-idf!50608
2026-08-31 11:06:42 +08:00
Jiang Jiang Jian 42dfe996d8 Merge branch 'fix/reverse-extended-address-byte-order-in-esp-radio-spiel_v6.1' into 'release/v6.1'
fix(openthread): add APIs to clear a single src match short and extended entry in esp radio spinel (v6.1)

See merge request espressif/esp-idf!50452
2026-08-31 11:03:50 +08:00
Jiang Jiang Jian e4c40573cf Merge branch 'feat/ble_log_compression_module_cfg_update_v6.1' into 'release/v6.1'
Feat/ble log compression module cfg update (6.1)

See merge request espressif/esp-idf!49876
2026-08-31 11:00:26 +08:00
Jiang Jiang Jian c5355945ae Merge branch 'fix/esp_idf_h4_pmu_icg_mapping_6.1' into 'release/v6.1'
fix(esp_hw_support): pmu_icg_mapping define mistake(v6.1)

See merge request espressif/esp-idf!51912
2026-08-31 10:56:22 +08:00
Jiang Jiang Jian 40feb79578 Merge branch 'feat/support_esp32s31_xtal_fosc_force_pu_v6.1' into 'release/v6.1'
feat: update XTAL sleep FPU parameters to save power (v6.1)

See merge request espressif/esp-idf!51896
2026-08-31 10:54:55 +08:00
Jiang Jiang Jian d293398710 Merge branch 'fix/fix_esp32p4_missing_pvt_clock_v6.1' into 'release/v6.1'
fix(esp_hw_support): fix esp32p4 PVT clock lost (v6.1)

See merge request espressif/esp-idf!51866
2026-08-31 10:54:25 +08:00
Jiang Jiang Jian f6f21f26c6 Merge branch 'fix/owe_prevent_double_free_v6.1' into 'release/v6.1'
fix(wifi): Prevent double free in owe failure path (v6.1)

See merge request espressif/esp-idf!51640
2026-08-31 10:53:10 +08:00
Jiang Jiang Jian 74d300692d Merge branch 'bugfix/backport_wifi_issues_v6.1_0804' into 'release/v6.1'
Bugfix/backport wifi issues v6.1

See merge request espressif/esp-idf!51488
2026-08-31 10:52:42 +08:00
Jiang Jiang Jian 6a9c44fe7e Merge branch 'fix/ble_log_compression_add_local_header_file_v6.1' into 'release/v6.1'
feat(ble_log): mirror local compression headers (6.1)

See merge request espressif/esp-idf!50953
2026-08-03 10:48:09 +08:00
Jiang Jiang Jian 7105b85101 Merge branch 'fix/backport_wifi_issues_v6.1' into 'release/v6.1'
Backport a few wifi fixes (Backport v6.1)

See merge request espressif/esp-idf!51224
2026-08-01 07:28:52 +08:00
Jiang Jiang Jian 2da2c60798 Merge branch 'bugfix/ftm_calibration_v6.1' into 'release/v6.1'
fix(ftm): Update FTM calibraton values for esp32c5, esp32c3, esp32c6, esp32c61

See merge request espressif/esp-idf!51407
2026-08-01 00:16:47 +08:00
Jiang Jiang Jian d52ecaa3ea Merge branch 'bugfix/low_spp_throughput_v6.1' into 'release/v6.1'
change(bt/bluedroid): increased port low watermark of RFCOMM (v6.1)

See merge request espressif/esp-idf!51083
2026-07-31 19:35:19 +08:00
Jiang Jiang Jian 6e61fd94a0 Merge branch 'fix/bind_lp_periph_pd_with_tsens_power_v6.1' into 'release/v6.1'
fix(esp_driver_tsens): bind lp_periph domain sleep pd with tsens power (v6.1)

See merge request espressif/esp-idf!51177
2026-07-31 19:34:23 +08:00
Jiang Jiang Jian 7661fce5f2 Merge branch 'fix/set_errno_if_usj_not_connect_in_vfs_v6.1' into 'release/v6.1'
fix(esp_driver_usb): set errno if usj not connect in vfs read/write (v6.1)

See merge request espressif/esp-idf!51198
2026-07-31 19:33:56 +08:00
Jiang Jiang Jian 14784e6054 Merge branch 'fix/fix_esp32s31_secureboot_fastwake_v6.1' into 'release/v6.1'
fix(esp_system): support rom secure boot fast wake feature for esp32s31 (v6.1)

See merge request espressif/esp-idf!51266
2026-07-31 18:00:06 +08:00
Jiang Jiang Jian 9bdecbe2ea Merge branch 'bugfix/bredr_acl_uflow_deadlock_v6.1' into 'release/v6.1'
fix(bt): Fixed blocking during LMP packet_type negotiation on ESP32-S31 (v6.1)

See merge request espressif/esp-idf!51095
2026-07-31 16:48:53 +08:00
Jiang Jiang Jian 41e3a0ef34 Merge branch 'feat/update_phylib_on_s31_c6_for_track_v6.1' into 'release/v6.1'
feat(phy): update phy lib for esp32s31 & esp32c6 for track (v6.1)

See merge request espressif/esp-idf!50790
2026-07-31 11:59:15 +08:00
Jiang Jiang Jian d7e4df3493 Merge branch 'fix/regdma_work_timeout_v6.1' into 'release/v6.1'
Workaround: add a write node to avoid the APB access timeout during REGDMA operations backport  v6.1

See merge request espressif/esp-idf!51383
2026-07-31 11:33:23 +08:00
Jiang Jiang Jian fdf5ee1e93 Merge branch 'feat/optimize_for_esp32h4_light_sleep_ble_current_v6.1_new_chip_only' into 'release/v6.1'
Feat/optimize for esp32h4 light sleep ble current v6.1 new chip only

See merge request espressif/esp-idf!51302
2026-07-31 11:32:41 +08:00
Jiang Jiang Jian 24718710ad Merge branch 'ci/enable_s31_ulp_multi_dev_v6.1' into 'release/v6.1'
ci(ulp): re-enable multi dev tests for S31 ULP (v6.1)

See merge request espressif/esp-idf!51143
2026-07-30 17:56:34 +08:00
Jiang Jiang Jian f1e1468cff Merge branch 'fix/ble-log-store-access-fault_v6.1' into 'release/v6.1'
fix: Ensure BLE Log Global Variables in Internal RAM (6.1)

See merge request espressif/esp-idf!51037
2026-07-29 16:54:11 +08:00
Jiang Jiang Jian cadfa9c096 Merge branch 'bugfix/rmac_scan_v6.1' into 'release/v6.1'
fix(esp_wifi): fix issues for scan, and NULL packets tx for random mac

See merge request espressif/esp-idf!50928
2026-07-18 22:12:00 +08:00
Jiang Jiang Jian c8e90095fc Merge branch 'bugfix/supplicant_crypto_code_correction_v6.1' into 'release/v6.1'
fix(wpa_supplicant): Correct some functions in crypto porting layer (v6.1)

See merge request espressif/esp-idf!50873
2026-07-18 21:04:55 +08:00
Jiang Jiang Jian 66d5ec660e Merge branch 'bugfix/fix_bredr_inq_crash_v6.1' into 'release/v6.1'
fix(bt/bluedroid): fix crash during bredr inquiry when zero-addr device is found (v6.1)

See merge request espressif/esp-idf!50853
2026-07-18 08:07:38 +08:00
Jiang Jiang Jian e61a30edce Merge branch 'backport/support-esp32s31-dfu-v6.1' into 'release/v6.1'
Feat/support esp32s31 dfu (v6.1)

See merge request espressif/esp-idf!50863
2026-07-18 08:07:22 +08:00
Jiang Jiang Jian ad1d045c69 Merge branch 'bugfix/nan_mem_corruption_v6.1' into 'release/v6.1'
Fix(NAN): fix Memory Corruption due to BIP encryption (Backport v6.1)

See merge request espressif/esp-idf!50883
2026-07-18 02:18:48 +08:00
Jiang Jiang Jian 4752de43dc Merge branch 'bugfix/add_en_rst_in_pvt_func_for_p4_backport_v6.1' into 'release/v6.1'
fix(pvt): add en reset in pvt func for p4 on release v6.1

See merge request espressif/esp-idf!50877
2026-07-18 01:34:50 +08:00
Jiang Jiang Jian aa2e492a8c Merge branch 'fix/esp32p4_secure_boot_sig_block_v6.1' into 'release/v6.1'
fix(esp32p4): secure boot (ECDSA-P384) and flash encryption eFuse fixes (v6.1)

See merge request espressif/esp-idf!50898
2026-07-18 01:32:56 +08:00
Jiang Jiang Jian 0f579637ed Merge branch 'fix/fix_esp_tee_iv_length_check_v6.1' into 'release/v6.1'
feat(esp_tee): ESP-TEE Security Audit fixes (v6.1)

See merge request espressif/esp-idf!50850
2026-07-18 01:31:29 +08:00
Jiang Jiang Jian 88b053119a Merge branch 'doc/bootloader-anti-rollback-fix_v6.1' into 'release/v6.1'
fix(docs): Update bootloader anti-rollback documentation (v6.1)

See merge request espressif/esp-idf!50837
2026-07-17 23:34:48 +08:00
Jiang Jiang Jian a5b5f6f1cc Merge branch 'bugfix/idfci-12737-fatfs-bdl-wl-storage-erase_v6.1' into 'release/v6.1'
fix(fatfs): erase storage partition before bdl_wl CI test (v6.1)

See merge request espressif/esp-idf!50889
2026-07-17 23:20:32 +08:00
Jiang Jiang Jian 9e4684c3bb Merge branch 'bugfix/nvs-flash-erase-partition-leak_v6.1' into 'release/v6.1'
fix(nvs_flash): delete temporary NVSPartition after erase (v6.1)

See merge request espressif/esp-idf!50890
2026-07-17 23:19:59 +08:00
Jiang Jiang Jian 01083b8017 Merge branch 'bugfix/vfs_fat_readdir_stat_cache_v6.1' into 'release/v6.1'
fix(fatfs): move readdir-stat cache to per-DIR stream (v6.1)

See merge request espressif/esp-idf!50903
2026-07-17 23:19:45 +08:00
Jiang Jiang Jian 1513bf3f3d Merge branch 'contrib/github_pr_18822_v6.1' into 'release/v6.1'
fix(esp_partition): prevent size_t overflow bypassing bounds checks on linux target (GitHub PR) (v6.1)

See merge request espressif/esp-idf!50907
2026-07-17 23:19:10 +08:00
Jiang Jiang Jian 392b949368 Merge branch 'contrib/github_pr_18829_v6.1' into 'release/v6.1'
fix(spiffs): fix off-by-one in spiffsgen.py obj name length check (GitHub PR) (v6.1)

See merge request espressif/esp-idf!50914
2026-07-17 23:19:06 +08:00
Jiang Jiang Jian a43c51681a Merge branch 'task/buildv2_full_pipeline_v6.1' into 'release/v6.1'
Enable full buildv2 pipeline (v6.1)

See merge request espressif/esp-idf!50351
2026-07-17 18:20:09 +08:00
Jiang Jiang Jian 522ee6dd74 Merge branch 'contrib/github_pr_18823_v6.1' into 'release/v6.1'
fix(vfs): use MAX_FDS instead of VFS_MAX_COUNT when clearing fd table on unregister (GitHub PR) (v6.1)

See merge request espressif/esp-idf!50697
2026-07-17 18:19:41 +08:00
Jiang Jiang Jian 961539aaa8 Merge branch 'contrib/github_pr_18817_v6.1' into 'release/v6.1'
fix(wear_levelling): guard WL_Flash::write()/read() against size==0 underflow (GitHub PR) (v6.1)

See merge request espressif/esp-idf!50730
2026-07-17 18:19:36 +08:00
Jiang Jiang Jian 0581c1e046 Merge branch 'fix/update_phylib_to_fix_esp32c61_bod_rts_v6.1' into 'release/v6.1'
fix(phy): fix esp32c61 bod rts(backport v6.1)

See merge request espressif/esp-idf!50862
2026-07-17 17:40:16 +08:00
Jiang Jiang Jian 9e9c16c724 Merge branch 'bugfix/change_pvt_timer_target_param_backport_v6.1' into 'release/v6.1'
feat(pvt): change pvt timer target & limit on release v6.1

See merge request espressif/esp-idf!50815
2026-07-17 16:12:52 +08:00
Jiang Jiang Jian e56f3d4c20 Merge branch 'fix/jpeg_enc_encrypt_v6.1' into 'release/v6.1'
fix(jpeg): Jpeg can encode and decode in encryption situation (backport v6.1)

See merge request espressif/esp-idf!50662
2026-07-17 15:57:07 +08:00
Jiang Jiang Jian 997fdc8435 Merge branch 'feat/csi_error_event_v6.1' into 'release/v6.1'
Add MIPI-CSI error event (v6.1)

See merge request espressif/esp-idf!50680
2026-07-17 15:57:04 +08:00
Jiang Jiang Jian 9cf02d6dc4 Merge branch 'fix/fix_coex_iso_cache_error_v6.1' into 'release/v6.1'
fix(coex): Fixed BLE iso coex cache error (6.1)

See merge request espressif/esp-idf!50849
2026-07-17 11:43:27 +08:00
Jiang Jiang Jian f2f57b2922 Merge branch 'fix/do_cache_lock_workaround_before_ipc_stall_v6.1' into 'release/v6.1'
fix(esp_hw_support): disable esp32 livelock workaround before stall another core (v6.1)

See merge request espressif/esp-idf!50768
2026-07-17 11:26:19 +08:00
Jiang Jiang Jian 9adc0ecf8e Merge branch 'backport/spi_slave_add_independent_tx_rx_length-v6.1' into 'release/v6.1'
feat(driver_spi): slave driver support config different tx/rx length (v6.1)

See merge request espressif/esp-idf!49960
2026-07-17 10:54:57 +08:00
Jiang Jiang Jian b3ec1371af Merge branch 'fix/bootloader_anti_rollback_konfig_v6.1' into 'release/v6.1'
fix(bootloader): Hide bootloader anti-rollback Kconfig where not supported (v6.1)

See merge request espressif/esp-idf!50816
2026-07-17 10:54:17 +08:00
Jiang Jiang Jian ec52a0cc95 Merge branch 'feat/tusb_msc_example_sdmmc_esp32s31_backport_v6.1' into 'release/v6.1'
feat(usb_device): Add SDMMC support for MSC USB Device example for esp32s31 target v6.1 backport

See merge request espressif/esp-idf!50827
2026-07-17 10:53:58 +08:00
Jiang Jiang Jian beefc5c263 Merge branch 'feat/idfgh-17859_v6.1' into 'release/v6.1'
backport v6.1: add kconfig option for REGDMA sleep clock ICG

See merge request espressif/esp-idf!50471
2026-07-17 10:45:12 +08:00
Jiang Jiang Jian 07c65b3819 Merge branch 'feature/chip764_power_glitch_support_v6.1' into 'release/v6.1'
feat(s31): bootloader power glitch reset config (v6.1)

See merge request espressif/esp-idf!50545
2026-07-17 10:44:46 +08:00
Jiang Jiang Jian 526285007f Merge branch 'fix/tx_power_validate_v6.1' into 'release/v6.1'
fix(bt): validate BR/EDR TX power against chip-supported range (v6.1)

See merge request espressif/esp-idf!50544
2026-07-17 10:32:04 +08:00
Jiang Jiang Jian 2dd51a0e75 Merge branch 'bugfix/avrc_ca_attr_id_check_v6.1' into 'release/v6.1'
fix(bt): Fix the validation of AVRCP metadata attr_id in handle_rc_attributes_rsp (v6.1)

See merge request espressif/esp-idf!50549
2026-07-17 10:31:02 +08:00
Jiang Jiang Jian f8e6e94dca Merge branch 'feat/usb_dfu_console_soc_caps_backport_v6.1' into 'release/v6.1'
feat(soc): add USB DFU and OTG console caps (backport v6.1)

See merge request espressif/esp-idf!49580
2026-07-17 10:30:26 +08:00
Jiang Jiang Jian 947e534927 Merge branch 'fix/mmap_cache_flash_wr_v6.1' into 'release/v6.1'
fix(mmap): fixed mmap read data wrong when flash being erased/written and cache not disabled (v6.1)

See merge request espressif/esp-idf!50117
2026-07-17 10:30:14 +08:00
Jiang Jiang Jian 14f663f003 Merge branch 'fix/pbkdf2_sha256_mbedtls4_guard_v6.1' into 'release/v6.1'
fix(wpa_supplicant): guard pbkdf2_sha256 for PSA-provided SHA-256 (v6.1)

See merge request espressif/esp-idf!50460
2026-07-16 18:57:43 +08:00
Jiang Jiang Jian 4fe6db39ca Merge branch 'bugfix/bug_bounty_av_v6.1' into 'release/v6.1'
fix(bt/bluedroid): Fix bug bounty issues about A/V from NVIDIA (v6.1)

See merge request espressif/esp-idf!50476
2026-07-16 18:57:38 +08:00
Jiang Jiang Jian adc1f663b4 Merge branch 'feat/add_lmp_dbg_vendor_v6.1' into 'release/v6.1'
feat(bt/controller): Added LMP debug vendor HCI and fixed some bugs ts on ESP32-S31 [backport v6.1]

See merge request espressif/esp-idf!50704
2026-07-16 18:56:58 +08:00
Jiang Jiang Jian 8158e1d350 Merge branch 'backport/esp32s31_static_cpu_retention_v6.1' into 'release/v6.1'
backport v6.1: fix build failure when CONFIG_PM_CPU_RETENTION_STATIC is enabled

See merge request espressif/esp-idf!50635
2026-07-16 17:38:32 +08:00
Jiang Jiang Jian aa44022e75 Merge branch 'fix/idfgh-17712-bootloader-extra-components_v6.1' into 'release/v6.1'
fix(bootloader): discover BOOTLOADER_EXTRA_COMPONENT_DIRS in cmake v1 (v6.1)

See merge request espressif/esp-idf!49719
2026-07-16 17:25:19 +08:00
Jiang Jiang Jian cc979db24b Merge branch 'backport/support_two_MAC_esp32s31_v6.1' into 'release/v6.1'
fix(esp32s31): restrict UNIVERSAL_MAC_ADDRESSES to Two (backport v6.1)

See merge request espressif/esp-idf!50571
2026-07-16 12:07:20 +08:00
Jiang Jiang Jian 6cb467a433 Merge branch 'bugfix/fix_bluedroid_read_multi_v6.1' into 'release/v6.1'
fix(ble/bluedroid): fix GATT Read Multiple response handling (6.1)

See merge request espressif/esp-idf!50710
2026-07-16 11:59:11 +08:00
Jiang Jiang Jian b136957d7b Merge branch 'fix/cleanup_after_failed_nvs_set_blob_v6.1' into 'release/v6.1'
Fixed cleanup after nvs_set_blob failed on ESP_ERR_NVS_NOT_ENOUGH_SPACE (v6.1)

See merge request espressif/esp-idf!50742
2026-07-16 11:42:53 +08:00
Jiang Jiang Jian a21d475532 Merge branch 'fix/backport_wifi_fixes_v6.1' into 'release/v6.1'
Backport a few wifi fixes to v6.1 (Backport v6.1)

See merge request espressif/esp-idf!50717
2026-07-16 11:42:29 +08:00
Jiang Jiang Jian 94bda02008 Merge branch 'fix/console-security-findings_v6.1' into 'release/v6.1'
fix(console): Fix security code review findings (v6.1)

See merge request espressif/esp-idf!50686
2026-07-16 11:41:03 +08:00
Jiang Jiang Jian 1dfc7914b5 Merge branch 'fix/esp_idf_h4h21_ana_wait_short_v6.1' into 'release/v6.1'
fix(esp_hw_support): fix xtal unstable when carry 154 and ble cases(v6.1)

See merge request espressif/esp-idf!50656
2026-07-16 11:40:13 +08:00
Jiang Jiang Jian 8f45ea4dcb Merge branch 'cleanup/remove-idf_test-component_v6.1' into 'release/v6.1'
chore: remove unused idf_test component (v6.1)

See merge request espressif/esp-idf!50650
2026-07-16 11:39:15 +08:00
Jiang Jiang Jian b78543ddb8 Merge branch 'fix/touch_read_check_v6.1' into 'release/v6.1'
fix(touch): fix hw_ver1 read data check (v6.1)

See merge request espressif/esp-idf!50638
2026-07-16 11:39:06 +08:00
Jiang Jiang Jian 21390d2e00 Merge branch 'refactor/move_regdma_entry_config_to_driver_layer_emac_v6.1' into 'release/v6.1'
refactor(emac): move sleep retention config into driver layer (v6.1)

See merge request espressif/esp-idf!50619
2026-07-16 11:36:38 +08:00
Jiang Jiang Jian 6005d5bb6a Merge branch 'fix/lwip_sec_high_v6.1' into 'release/v6.1'
fix(lwip): high severity lwip fixes (v6.1)

See merge request espressif/esp-idf!50590
2026-07-16 11:35:55 +08:00
Jiang Jiang Jian b3f2e9e67b Merge branch 'fix/uhci_rx_fsm_v6.1' into 'release/v6.1'
fix(uhci): rx fsm race condition (v6.1)

See merge request espressif/esp-idf!50577
2026-07-16 11:35:38 +08:00