Jiang Jiang Jian
834bb54d3c
Merge branch 'fix/newlib-nano-nosys-linking_v6.0' into 'release/v6.0'
...
fix(libc): nano: add -lnosys to linking to avoid CMake configuration issues (v6.0)
See merge request espressif/esp-idf!49378
2026-06-29 15:38:27 +08:00
Jiang Jiang Jian
1331f17ad1
Merge branch 'feat/adds_ds_qemu_test_v6.0' into 'release/v6.0'
...
feat: adds mutual auth example (v6.0)
See merge request espressif/esp-idf!49341
2026-06-29 15:38:21 +08:00
Jiang Jiang Jian
4cc49bd9b7
Merge branch 'fix/ble_mesh_bug_report_v2_v6.0' into 'release/v6.0'
...
fix(ble_mesh): Miscellaneous bugfixes according to our internal bug report (v2) (v6.1)
See merge request espressif/esp-idf!49321
2026-06-29 15:37:24 +08:00
Jiang Jiang Jian
870760093f
Merge branch 'bugfix/acl_conn_state_error_v6.0' into 'release/v6.0'
...
fix: Fix missing handling for HCI_ERR_CONNECTION_EXISTS (v6.0)
See merge request espressif/esp-idf!49313
2026-06-29 15:37:20 +08:00
Jiang Jiang Jian
3760687ba4
Merge branch 'feat/feat_enable_h21_light_sleep_v6.0' into 'release/v6.0'
...
fix(ble): disable flash pd config (6.0)
See merge request espressif/esp-idf!49216
2026-06-29 15:37:14 +08:00
Jiang Jiang Jian
08f007f68d
Merge branch 'fix-bind_int_wdt_to_cache_livelock_fix_v6.0' into 'release/v6.0'
...
fix(esp_system): bind int_wdt to cache livelock workaround (v6.0)
See merge request espressif/esp-idf!49169
2026-06-29 15:36:59 +08:00
Jiang Jiang Jian
340b3aaa65
Merge branch 'change/esp_idf_ulp_add_int_api_6.0' into 'release/v6.0'
...
change(ulp): add lp periph intr enable apis v6.0
See merge request espressif/esp-idf!49143
2026-06-29 15:36:10 +08:00
Jiang Jiang Jian
e1b8106e92
Merge branch 'doc-fix_sleep_mode_doc_v6.0' into 'release/v6.0'
...
docs(system): update GPIO wakeup section for clarity on EXT0 and EXT1 support (v6.0)
See merge request espressif/esp-idf!49113
2026-06-29 15:36:02 +08:00
Jiang Jiang Jian
dcbeafd594
Merge branch 'feat/esp_trace_example_v6.0' into 'release/v6.0'
...
esp_trace example library integration (v6.0)
See merge request espressif/esp-idf!49092
2026-06-29 15:35:30 +08:00
Jiang Jiang Jian
95bb9822c4
Merge branch 'feat/update_twt_example_v6.0' into 'release/v6.0'
...
feat(wifi): update itwt example for different chips(backport v6.0)
See merge request espressif/esp-idf!49042
2026-06-29 15:35:10 +08:00
Jiang Jiang Jian
2ffe474494
Merge branch 'fix/vfs_incorect_deprecation_v6.0' into 'release/v6.0'
...
fix(storage/vfs): Mark the correct version of function deprecated (v6.0)
See merge request espressif/esp-idf!49017
2026-06-29 15:33:12 +08:00
Jiang Jiang Jian
bf2aed1697
Merge branch 'fix/sdmmc_reinit_error_v6.0' into 'release/v6.0'
...
fix(sdmmc): fix sdmmc re-init error (v6.0)
See merge request espressif/esp-idf!49010
2026-06-29 15:33:05 +08:00
Jiang Jiang Jian
4ebe898101
Merge branch 'feat/ble-log-iram-optim_v6.0' into 'release/v6.0'
...
opt(bt): Move SPI Tx Callback to Flash When SPI ISR IN IRAM Disabled (6.0)
See merge request espressif/esp-idf!48924
2026-06-29 15:32:59 +08:00
Jiang Jiang Jian
0855c331d7
Merge branch 'fix/esp32c5_usj_console_stuck_v6.0' into 'release/v6.0'
...
fix(esp32c5): Do not disable UART0 sclk when USB Serial/JTAG is primary console (v6.0)
See merge request espressif/esp-idf!48874
2026-06-29 15:32:15 +08:00
Jiang Jiang Jian
b84f9a72b5
Merge branch 'bugfix/idfci-10775-fatfs-wl-dyn-buffers-ci-timeout_v6.0' into 'release/v6.0'
...
fix(storage): mark storage pytest apps flaky in CI (v6.0)
See merge request espressif/esp-idf!48807
2026-06-29 15:31:58 +08:00
Jiang Jiang Jian
667244d9d7
Merge branch 'fix/ws_transport_reject_oversize_v6.0' into 'release/v6.0'
...
fix(ws_transport): reject oversized 64-bit WebSocket payload length (v6.0)
See merge request espressif/esp-idf!48799
2026-06-29 15:31:50 +08:00
Jiang Jiang Jian
ec50de41d2
Merge branch 'bugfix/nvs-blockdev-skip-nvs-ram-test_v6.0' into 'release/v6.0'
...
fix(nvs_flash): skip SPIRAM heap test on non-spiram configs (v6.0)
See merge request espressif/esp-idf!48784
2026-06-29 15:31:29 +08:00
Jiang Jiang Jian
4ea1cda1ff
Merge branch 'feat/add_teardown_for_openthread_case_v6.0' into 'release/v6.0'
...
ci: add tear down for openthread ci case (v6.0)
See merge request espressif/esp-idf!48778
2026-06-29 15:31:26 +08:00
Jiang Jiang Jian
fd4f77c8e6
Merge branch 'bugfix/nvs-bootloader-pytest-app-log_v6.0' into 'release/v6.0'
...
test(nvs_bootloader): mark nvs bootloader pytest as flaky (v6.0)
See merge request espressif/esp-idf!48697
2026-06-29 15:31:13 +08:00
Jiang Jiang Jian
8bd0912274
Merge branch 'fix/optimize_the_ot_ci_v6.0' into 'release/v6.0'
...
fix(openthread): wait for all onlink GUAs to finish DAD before tests (v6.0)
See merge request espressif/esp-idf!48687
2026-06-29 15:30:26 +08:00
Jiang Jiang Jian
6a989d0beb
Merge branch 'bugfix/perf-benchmark-spiflash-ci-idfci-8082_v6.0' into 'release/v6.0'
...
fix(examples): suppress perf_benchmark printf in CI (v6.0)
See merge request espressif/esp-idf!48643
2026-06-29 15:29:45 +08:00
Marius Vikhammer
3b286227e8
Merge branch 'bugfix/int_wdt_default_psram_v6.0' into 'release/v6.0'
...
fix(iwdt): increased default timeout if using PSRAM (v6.0)
See merge request espressif/esp-idf!49481
2026-06-29 15:07:05 +08:00
Fu Hanxi
cef0b6071d
Merge branch 'ci/remove_deprecated_sha_update_job_v6.0' into 'release/v6.0'
...
ci: remove deprecated SHA update job (v6.0)
See merge request espressif/esp-idf!48638
2026-06-29 08:54:48 +02:00
Evgeny Torbin
aff8dc2675
ci: remove deprecated SHA update job
2026-06-29 14:43:25 +08:00
Marius Vikhammer
837628688e
Merge branch 'contrib/github_pr_18664_v6.0' into 'release/v6.0'
...
ulp_riscv: prioritize error bits over data flags in I2C interrupt wait (GitHub PR) (v6.0)
See merge request espressif/esp-idf!49717
2026-06-29 14:42:18 +08:00
Island
98effc1d13
Merge branch 'feat/format_bt_hci_to_btsnoop_v6.0' into 'release/v6.0'
...
refactor(bt): migrate bt_hci_to_btsnoop to esp-pylib (6.0)
See merge request espressif/esp-idf!49710
2026-06-29 14:39:47 +08:00
Island
608c9495a4
Merge branch 'bugfix/fix_ble_reg_notify_no_fail_v6.0' into 'release/v6.0'
...
validate handle in esp_ble_gattc_register_for_notify (6.0)
See merge request espressif/esp-idf!48546
2026-06-29 14:39:34 +08:00
Island
760495e0b2
Merge branch 'fix/ble_funcs_reset_default_enabled_v6.0' into 'release/v6.0'
...
fix(bt): Add default BLE controller funcs reset enable (6.0)
See merge request espressif/esp-idf!49138
2026-06-29 14:39:15 +08:00
cjin
e7c9bcbda8
fix(ble): remove chip id macro for ble sample codes
2026-06-29 14:21:35 +08:00
Mahavir Jain
e038ca923c
Merge branch 'fix/esp_tee_buffer_overflow_v6.0' into 'release/v6.0'
...
fix(esp_tee): fix buffer overflow (v6.0)
See merge request espressif/esp-idf!49303
2026-06-29 11:38:05 +05:30
Mahavir Jain
96008173aa
Merge branch 'fix/rsa_ds_driver_constant_time_v6.0' into 'release/v6.0'
...
Fix/rsa ds driver constant time (v6.0)
See merge request espressif/esp-idf!49699
2026-06-29 11:23:54 +05:30
Mahavir Jain
4163417ff1
Merge branch 'feat/support_rom_psa_mbedtls_v6.0' into 'release/v6.0'
...
feat(mbedtls): enable ESP32-C2(Rev2.0) ROM mbedTLS crypto for PSA (v6.0)
See merge request espressif/esp-idf!48843
2026-06-29 11:22:33 +05:30
Mahavir Jain
ce7b803aac
Merge branch 'fix/esp_tee_heap_poison_v6.0' into 'release/v6.0'
...
fix(esp_tee): Prevent TEE from dispatching the REE heap poisoning callback (v6.0)
See merge request espressif/esp-idf!49911
2026-06-29 11:21:31 +05:30
Mahavir Jain
732111f75a
Merge branch 'feat/esp_tee_backports_v6.0' into 'release/v6.0'
...
feat(esp_tee): Feature/fixes backports to `release/v6.0`
See merge request espressif/esp-idf!48486
2026-06-29 11:21:13 +05:30
Mahavir Jain
ac752849fc
Merge branch 'bugfix/fix_protocomm_sec2_double_free_decrypt_v6.0' into 'release/v6.0'
...
fix(protocomm): null output buffer pointer on crypto failure (v6.0)
See merge request espressif/esp-idf!49701
2026-06-29 11:20:32 +05:30
Mahavir Jain
ff155dbaf8
Merge branch 'bugfix/openthread_exclude_cve_v6.0' into 'release/v6.0'
...
fix(openthread): exclude CVE-2026-8369 from the list (v6.0)
See merge request espressif/esp-idf!48724
2026-06-29 11:20:21 +05:30
Mahavir Jain
c20b090b21
Merge branch 'fix/https-redirect-downgrade_v6.0' into 'release/v6.0'
...
fix(esp_http_client): block HTTPS-to-HTTP redirect downgrade (v6.0)
See merge request espressif/esp-idf!48979
2026-06-29 11:19:22 +05:30
Mahavir Jain
a4a2a4a5cb
Merge branch 'fix_https_request_rom_impl_ci_failure_v6.0' into 'release/v6.0'
...
fix(examples): make https_request rom_impl CI test resilient to transient external server failures (backport v6.0)
See merge request espressif/esp-idf!48418
2026-06-29 11:18:51 +05:30
Mahavir Jain
9f97a4dcd0
Merge branch 'fix/handle_return_code_304_during_ota_head_request_v6.0' into 'release/v6.0'
...
fix: handle return code 304 during HTTP HEAD request in partial OTA (v6.0)
See merge request espressif/esp-idf!49763
2026-06-29 11:18:37 +05:30
Mahavir Jain
3807632d83
Merge branch 'contrib/github_pr_18641_v6.0' into 'release/v6.0'
...
fix(protocomm): prevent out-of-bounds write in console line buffer (GitHub PR) (v6.0)
See merge request espressif/esp-idf!49343
2026-06-29 11:18:08 +05:30
Mahavir Jain
7292d67dd6
Merge branch 'feat/restful_server_upgrade_vite_version_v6.0' into 'release/v6.0'
...
feat(http_server/restful_server): Upgraded Vite version (v6.0)
See merge request espressif/esp-idf!49415
2026-06-29 11:17:58 +05:30
Mahavir Jain
e082ad95da
Merge branch 'fix/memory_leak_cross_signed_cert_verify_v6.0' into 'release/v6.0'
...
fix(esp_crt_bundle): fixes verification failures with cross signed certificates (v6.0)
See merge request espressif/esp-idf!48624
2026-06-29 11:17:37 +05:30
Marius Vikhammer
860412d3bf
Merge branch 'fix/heap-minimum-free-size_v6.0' into 'release/v6.0'
...
fix(heap): Do not consider newly registered heap in minimum free size calculation (v6.0)
See merge request espressif/esp-idf!49036
2026-06-29 13:45:31 +08:00
Roland Dobai
e2ef9d8e1a
Merge branch 'fix/cmakev2-bootloader-spiram-source-guards_v6.0' into 'release/v6.0'
...
fix(esp_hw_support): guard SPIRAM uses with !BOOTLOADER_BUILD (v6.0)
See merge request espressif/esp-idf!48685
2026-06-29 07:42:44 +02:00
Roland Dobai
31260fd35e
Merge branch 'fix/cmakev2_manager_seed_known_components_v6.0' into 'release/v6.0'
...
fix(cmakev2/manager): seed known_components for namespace rewrite (v6.0)
See merge request espressif/esp-idf!48686
2026-06-29 07:42:02 +02:00
Roland Dobai
913be3895f
Merge branch 'fix/idfgh-17712-bootloader-extra-components_v6.0' into 'release/v6.0'
...
fix(bootloader): discover BOOTLOADER_EXTRA_COMPONENT_DIRS in cmake v1 (v6.0)
See merge request espressif/esp-idf!49720
2026-06-29 07:40:28 +02:00
Roland Dobai
63f60b019b
Merge branch 'contrib/github_pr_18556_v6.0' into 'release/v6.0'
...
fix(tools): idf_tools.py uninstall: initialize archive_version before use (GitHub PR) (v6.0)
See merge request espressif/esp-idf!48825
2026-06-29 07:38:37 +02:00
Roland Dobai
20f0826cb5
Merge branch 'ci/bump-up-kconfig-precommit_v6.0' into 'release/v6.0'
...
ci(pre-commit): bump up kconfig related checks (v6.0)
See merge request espressif/esp-idf!48873
2026-06-29 07:37:56 +02:00
Roland Dobai
1c097b7acd
Merge branch 'feat/replace_click_witch_rich_click_v6.0' into 'release/v6.0'
...
feat(tools): Replaced click with rich_click (v6.0)
See merge request espressif/esp-idf!49021
2026-06-29 07:37:36 +02:00
Roland Dobai
100484f2da
Merge branch 'feat/mcp_server_accept_project_dir_v6.0' into 'release/v6.0'
...
feat(tools): mcp-server accepts project_dir from chat (v6.0)
See merge request espressif/esp-idf!50033
2026-06-29 07:37:09 +02:00