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
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
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
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
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
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
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
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
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
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
Mahavir Jain
92d73bce28
Merge branch 'feat/fix_ws_server_httpd_queue_work_silent_drop_v6.0' into 'release/v6.0'
...
fix(esp_http_server): prevent silent message drop in httpd_queue_work (v6.0)
See merge request espressif/esp-idf!49353
2026-06-29 11:06:05 +05:30
morris
32a54c35de
Merge branch 'fix/twaifd_assert_fail_v6.0' into 'release/v6.0'
...
fix(driver_twai): fix driver assert fail when send frame (v6.0)
See merge request espressif/esp-idf!49941
2026-06-29 12:35:29 +08:00
Marius Vikhammer
cca4de5e78
Merge branch 'fix/isp_iram_safe_typo_v6.0' into 'release/v6.0'
...
fix(isp): fix typo in CONFIG_ISP_ISR_IRAM_SAFE macro reference (v6.0)
See merge request espressif/esp-idf!49068
2026-06-29 11:40:54 +08:00
morris
760918458a
Merge branch 'fix/fix_rgb_frame_buffer_alignment_v6.0' into 'release/v6.0'
...
fix(gdma): fix buffer alignment when psram ecc enabled (v6.0)
See merge request espressif/esp-idf!49997
2026-06-29 11:13:21 +08:00
morris
267f16f8cc
Merge branch 'fix/esp_hal_usb_fsls_phy_default_settings_backport_v6.0' into 'release/v6.0'
...
fix(esp_hal_usb): Fix internal PHY default settings (backport v6.0)
See merge request espressif/esp-idf!48821
2026-06-29 10:59:54 +08:00
morris
d91bff2f0f
Merge branch 'ci/twai-runner-update-v6.0' into 'release/v6.0'
...
ci: twai runner setup v6.0
See merge request espressif/esp-idf!49803
2026-06-29 10:59:17 +08:00
morris
cabc6100a7
Merge branch 'fix/jpeg_over_size_v6.0' into 'release/v6.0'
...
fix(jpeg): Fix the jpeg size might exceed the buffer size (release v6.0)
See merge request espressif/esp-idf!50027
2026-06-29 10:56:45 +08:00
morris
30c30c3a8d
Merge branch 'bugfix/sdio_slave_buffer_size_limit_v6.0' into 'release/v6.0'
...
fix(sdio_slave): align buffer size checks with descriptor limits (v6.0)
See merge request espressif/esp-idf!49899
2026-06-29 10:50:40 +08:00
morris
6c6071aa3c
Merge branch 'ci/move_adc_runner_to_generic_v6.0' into 'release/v6.0'
...
ci(adc): move all ADC runners to generic (v6.0)
See merge request espressif/esp-idf!49793
2026-06-29 10:50:11 +08:00
morris
b090f3d602
Merge branch 'fix/fix_mipi_lcd_dirty_buffer_v6.0' into 'release/v6.0'
...
feat(lcd): support buffer switch interrupt (v6.0)
See merge request espressif/esp-idf!49101
2026-06-29 10:49:26 +08:00
Marius Vikhammer
3a35c57824
fix(isp): fix typo in CONFIG_ISP_ISR_IRAM_SAFE macro reference
...
SAEE -> SAFE in isp_ae.c, causing the IRAM safety check to never
trigger regardless of the Kconfig setting.
2026-06-29 10:32:05 +08:00
Marius Vikhammer
b170866059
Merge branch 'bugfix/ulp_lp_core_wakeup_race_v6.0' into 'release/v6.0'
...
fix(ulp): fix LP core wakeup race with LP timer (v6.0)
See merge request espressif/esp-idf!49562
2026-06-29 10:31:56 +08:00
Marius Vikhammer
08c4e54ec5
fix(iwdt): increased default timeout if using PSRAM
...
Default timeout for interrupt WDT was increased by default
on ESP32, due to some heap integrity check APIs taking a long
time on large PSRAMs and causing timeouts.
But this adjustment was only done for ESP32, not later chips,
even though they may experience the same issue.
Adjusted to have the same behavior on all chips with PSRAM
enabled, making it consistant with the docs.
Closes https://github.com/espressif/esp-idf/issues/18360
2026-06-29 10:31:38 +08:00
Marius Vikhammer
f83bc1cdb2
Merge branch 'fix/lp-core-rc-fast-delay_v6.0' into 'release/v6.0'
...
fix(ulp): use SoC RC_FAST frequency for LP core delay (v6.0)
See merge request espressif/esp-idf!49858
2026-06-29 10:31:01 +08:00
Marius Vikhammer
20febcced2
Merge branch 'fix/h4-esp-timer-latency_v6.0' into 'release/v6.0'
...
test(esp_timer): increase H4 callback latency limit (v6.0)
See merge request espressif/esp-idf!49696
2026-06-29 10:30:25 +08:00
morris
788de74e43
Merge branch 'fix/fix_parlio_valid_delay_max_value_v6.0' into 'release/v6.0'
...
fix(parlio): fix max valid delay value (v6.0)
See merge request espressif/esp-idf!49391
2026-06-29 10:21:52 +08:00
morris
7528ddc4d6
Merge branch 'fix/fix_dma2d_async_memcpy_msync_v6.0' into 'release/v6.0'
...
fix(dma2d): fix dma2d async memcpy msync (v6.0)
See merge request espressif/esp-idf!48721
2026-06-29 10:19:57 +08:00