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
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
Roland Dobai
c97a957d3b
Merge branch 'fix/cmake-colors_v6.0' into 'release/v6.0'
...
fix: force colors in output of RunTool and ensure_build_directory (v6.0)
See merge request espressif/esp-idf!50036
2026-06-29 07:36:51 +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
94fa48c111
Merge branch 'fix/fix_i80_example_high_failure_ratio_v6.0' into 'release/v6.0'
...
test(lcd): fix i80 lcd example pytest failure (v6.0)
See merge request espressif/esp-idf!49025
2026-06-29 10:20:31 +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