Konstantin Kondrashov
6b5a248638
fix(docs): Update bootloader anti-rollback documentation
2026-07-16 13:39:14 +03:00
Aditya Patwardhan
9dc17f98b0
Merge branch 'backport/44987_v6.1' into 'release/v6.1'
...
feat(esp-tls): Added a PSA driver for Secure Element (backport v6.1)
See merge request espressif/esp-idf!50334
2026-07-16 15:37:49 +05:30
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
Jiang Jiang Jian
64218b5dd3
Merge branch 'bugfix/smp_sec_flags_v6.1' into 'release/v6.1'
...
fix(bt/bluedroid): fixed several security issues from NVIDIA (v6.1)
See merge request espressif/esp-idf!50565
2026-07-16 11:35:17 +08:00
Jiang Jiang Jian
8346b7596e
Merge branch 'feat/sec_esp_drivers_v6.1' into 'release/v6.1'
...
fix(drivers): harden multiple peripheral drivers against local DoS and memory corruption (v6.1)
See merge request espressif/esp-idf!50555
2026-07-16 11:33:01 +08:00
Jiang Jiang Jian
3299c3527d
Merge branch 'bugfix/idf_ci_hid_example_v6.1' into 'release/v6.1'
...
fix(bt/example): Add print the device name to verify if it matches in HID example (v6.1)
See merge request espressif/esp-idf!50482
2026-07-16 11:32:43 +08:00
Jiang Jiang Jian
78519ced02
Merge branch 'feat/update_openthread_submodule_and_br_lib_20260624_v6.1' into 'release/v6.1'
...
feat(openthread): update openthread submodule (v6.1)
See merge request espressif/esp-idf!50518
2026-07-16 11:30:55 +08:00
Jiang Jiang Jian
5595996fe8
Merge branch 'feat/update_pmu_pau_reg_description_v6.1' into 'release/v6.1'
...
feat(soc): update esp32c61 PMU & PAU reg header descriptions (v6.1)
See merge request espressif/esp-idf!50431
2026-07-16 11:28:44 +08:00
Jiang Jiang Jian
66ed442256
Merge branch 'fix/fatfs_vulnerabilities_v6.1' into 'release/v6.1'
...
fix(fatfs): harden against runZero 2026 FatFs bugs (v6.1)
See merge request espressif/esp-idf!50424
2026-07-16 11:28:22 +08:00
Jiang Jiang Jian
f6eadf3e95
Merge branch 'fix/fix_mpll_enable_order_v6.1' into 'release/v6.1'
...
fix(esp_hw_support): fix esp32s31 mpll initialization (v6.1)
See merge request espressif/esp-idf!50430
2026-07-16 11:28:17 +08:00
Jiang Jiang Jian
0196213a13
Merge branch 'fix/ble_mesh_fixed_issues_v6.1' into 'release/v6.1'
...
Resolve reported BLE mesh stack issues (6.1)
See merge request espressif/esp-idf!50408
2026-07-16 11:27:36 +08:00
Jiang Jiang Jian
f174b3baa6
Merge branch 'fix/vfs_fatfs_test_stale_partition_v6.1' into 'release/v6.1'
...
test(vfs): reformat WL FATFS in setup to avoid stale-partition flakes (v6.1)
See merge request espressif/esp-idf!50400
2026-07-16 11:27:21 +08:00
Jiang Jiang Jian
0e479cbf81
Merge branch 'bugfix/i2c_set_but_not_used_variable_v6.1' into 'release/v6.1'
...
fix(i2c): remove unused but set variables (v6.1)
See merge request espressif/esp-idf!50370
2026-07-16 10:48:53 +08:00
Jiang Jiang Jian
301caa6d45
Merge branch 'docs/ulp_fsm_instruction_v6.1' into 'release/v6.1'
...
docs(ulp): clarify ULP FSM instruction cycle timing (v6.1)
See merge request espressif/esp-idf!50365
2026-07-16 10:48:39 +08:00
Jiang Jiang Jian
e813155ec4
Merge branch 'feature/dma2d_ppa_sleep_retention_support_v6.1' into 'release/v6.1'
...
feat(ppa): add sleep retention support for DMA2D and PPA (v6.1)
See merge request espressif/esp-idf!50342
2026-07-16 10:48:27 +08:00
Jiang Jiang Jian
479ff2c98b
Merge branch 'change/change_regdma_malloc_caps_v6.1' into 'release/v6.1'
...
change(esp_hw_support): change regdma malloc caps to allow getting memory in the DMA pool (v6.1)
See merge request espressif/esp-idf!50257
2026-07-16 10:44:21 +08:00
Jiang Jiang Jian
3e573b992b
Merge branch 'fix/fix_async_color_convert_csc_v6.1' into 'release/v6.1'
...
fix(dma2d): fix async color convert csc check (v6.1)
See merge request espressif/esp-idf!50238
2026-07-16 10:43:55 +08:00
Jiang Jiang Jian
68137eca5d
Merge branch 'fix/fix_ble_rtc_register_issue_after_reset_v6.1' into 'release/v6.1'
...
fix(ble): fix ble rtc reset issues on esp32-h4 and esp32-s31 (6.1)
See merge request espressif/esp-idf!50204
2026-07-16 10:43:26 +08:00
Jiang Jiang Jian
7a0db8d0aa
Merge branch 'fix/ble_mesh_disable_adv_pkt_discard_log_v6.1' into 'release/v6.1'
...
fix(ble_mesh): Disable warning logging when advertising packets are discarded (6.1)
See merge request espressif/esp-idf!50168
2026-07-16 10:42:18 +08:00
Jiang Jiang Jian
590dab22f9
Merge branch 'fix/fix_rgb_frame_buffer_alignment_v6.1' into 'release/v6.1'
...
fix(gdma): fix buffer alignment when psram ecc enabled (v6.1)
See merge request espressif/esp-idf!49996
2026-07-16 10:40:18 +08:00
Jiang Jiang Jian
b259c51ee3
Merge branch 'change/update_c61_gdma_header_v6.1' into 'release/v6.1'
...
change(ahb_dma): update c61 eco3 header files (v6.1)
See merge request espressif/esp-idf!49835
2026-07-16 10:38:55 +08:00
Konstantin Kondrashov
5bc1dfc166
fix(bootloader): handle extra component dirs in v1 subproject
...
Closes https://github.com/espressif/esp-idf/issues/18651
2026-07-16 10:37:12 +08:00
Mahavir Jain
1918bb2b10
Merge branch 'bugfix/memory-safety-and-validation_v6.1' into 'release/v6.1'
...
fix(security): findings from project Vanessa (v6.1)
See merge request espressif/esp-idf!50390
2026-07-15 21:52:48 +05:30
Aditya Patwardhan
3e6429e881
fix(esp-tls): Keep deprecated use_secure_element field for compatibility
...
Restore the use_secure_element field in esp_tls_cfg_t, esp_tls_cfg_server_t
and httpd_ssl_config_t, and esp_transport_ssl_use_secure_element(), as
deprecated no-ops so that existing code keeps compiling. Setting them now
fails at runtime with ESP_ERR_NOT_SUPPORTED, as the feature is accessed
via the esp_key_config_t interface. To be removed in the next major release.
No compile-time deprecation attribute on this release branch; the field and
function stay warning-free here and carry only documentation notes.
2026-07-15 15:34:17 +05:30
Aditya Patwardhan
39a219331c
Merge branch 'feature/update-openocd-to-v0.12.0-esp32-20260703_v6.1' into 'release/v6.1'
...
feat(tools): update openocd version to v0.12.0-esp32-20260703 (v6.1)
See merge request espressif/esp-idf!50502
2026-07-15 12:26:55 +05:30
radek.tandler
f26db8177e
fix(nvs_flash): fixed cleanup after nvs_set_blob failed on ESP_ERR_NVS_NOT_ENOUGH_SPACE
...
- fixed identification of blob parts to be cleaned by using right starting chunk index
- improved localisation of blobs for cases where some of pages get reclaimed
- created host test cases covering the edge cases above
2026-07-14 16:42:27 +02:00
Akshat Agrawal
9c42f5f06f
fix(nan): Transmit NULL packet correctly to avoid NDP termination
2026-07-14 10:31:40 +05:30
Shreyas Sheth
1519772ea8
fix(wpa_supplicant): Fix issues related to pmkid mismatch and eloop for dpp
2026-07-14 10:31:19 +05:30
tarun.kumar
abe397bdf8
fix(wifi) : Correct blacklist flag
...
- Fixes state desync where global blacklist was cleared but blacklist bss flag was true causing rejection of correct AP as well.
2026-07-14 10:31:06 +05:30
zhangyanjiao
a83db6a045
fix(wifi): fixed the offchan tx fail when SPIRAM_TRY_ALLOCATE_WIFI_LWIP enabled
2026-07-14 10:30:52 +05:30
Zhang Hai Peng
b50cef44fb
docs(ble/bluedroid): fix markdown formatting in example docs
...
(cherry picked from commit dba450de6b )
Co-authored-by: zhanghaipeng <zhanghaipeng@espressif.com >
2026-07-14 10:37:22 +08:00
Zhang Hai Peng
a6404dcf8d
fix(ble/bluedroid): downgrade numeric comparison log to warning
...
(cherry picked from commit 72a49ed53b )
Co-authored-by: zhanghaipeng <zhanghaipeng@espressif.com >
2026-07-14 10:37:22 +08:00
Zhang Hai Peng
f4c2b75897
fix(ble/bluedroid): preserve ext adv state when set params fails
...
Only update extend_adv_cb after HCI Set Extended Advertising
Parameters succeeds, so a failed update does not corrupt cached
legacy_pdu and related fields used by adv data validation.
(cherry picked from commit 31bd80fee8 )
Co-authored-by: zhanghaipeng <zhanghaipeng@espressif.com >
2026-07-14 10:37:21 +08:00
Zhang Hai Peng
169bf6975b
fix(ble/bluedroid): reject invalid ATT error code 0x00 on client
...
Map received error reason 0x00 to GATT_UNKNOWN_ERROR so the client
does not report GATT_SUCCESS with zero-length data on malformed errors.
(cherry picked from commit 1b6f9380f4 )
Co-authored-by: zhanghaipeng <zhanghaipeng@espressif.com >
2026-07-14 10:36:38 +08:00
Zhang Hai Peng
be95975fee
fix(ble/bluedroid): use sr_cmd status for GATT server error rsp
...
When sending an ATT error response after a failed server operation,
use p_tcb->sr_cmd.status instead of the last app callback status so
invalid error code 0x00 is not sent to the peer.
(cherry picked from commit 4c0488d92a )
Co-authored-by: zhanghaipeng <zhanghaipeng@espressif.com >
2026-07-14 10:36:36 +08:00
Zhang Hai Peng
96b27367a1
fix(ble/bluedroid): match read-multiple-var responses by handle
...
(cherry picked from commit 979c7dc567 )
Co-authored-by: zhanghaipeng <zhanghaipeng@espressif.com >
2026-07-14 10:36:34 +08:00
Zhang Hai Peng
2bb2f01dd3
fix(ble/bluedroid): match read-multiple responses by handle
...
Read Multiple may mix stack auto-responses with app async responses,
so multi_rsp_q order can differ from the request handle order. Look up
each response by handle (with occurrence for duplicates) instead of
walking the queue by index, and treat opcode-only buffers as empty.
(cherry picked from commit f91a41510c )
Co-authored-by: zhanghaipeng <zhanghaipeng@espressif.com >
2026-07-14 10:36:33 +08:00
Guillaume Souchere
150a067da5
fix(console): Clamp linenoise cols field to 80 if getColums returns less than that
2026-07-13 12:15:56 +02:00