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
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
morris
3576e8a4d4
Merge branch 'bugfix/gpspi_flash_freq_calc_v6.0' into 'release/v6.0'
...
fix(spi_flash): gpspi flash clock could reach higher frequency (v6.0)
See merge request espressif/esp-idf!49441
2026-06-29 10:18:04 +08:00
morris
383369eeb3
Merge branch 'bugfix/ppa_blend_yuv_hang_v6.0' into 'release/v6.0'
...
fix(ppa): fix hang if blend operation on a YUV format input background image (v6.0)
See merge request espressif/esp-idf!49735
2026-06-29 10:17:45 +08:00
morris
6dc0cc8de2
Merge branch 'test/uart_dma_ota_fix_v6.0' into 'release/v6.0'
...
refactor(uhci): refactor uart_dma_ota example (v6.0)
See merge request espressif/esp-idf!48755
2026-06-29 10:15:47 +08:00
morris
f788ecfc6b
Merge branch 'fix/h4_s31_enable_multi_board_test_v6.1' into 'release/v6.0'
...
fix(driver_sdmmc): test app correct p4 sdkconfig (v6.0)
See merge request espressif/esp-idf!49933
2026-06-29 10:13:54 +08:00
morris
f506673289
Merge branch 'feat/lcd_i2c_use_configurable_timeout_v6.0' into 'release/v6.0'
...
feat(lcd): add configurable timeout for lcd i2c panel (v6.0)
See merge request espressif/esp-idf!48663
2026-06-29 10:12:38 +08:00
morris
df8b29aafc
Merge branch 'doc/i2s_esp32_mclk_restriction_v6.0' into 'release/v6.0'
...
docs(i2s): add note for the restriction of MCLK on esp32 (v6.0)
See merge request espressif/esp-idf!48571
2026-06-29 10:12:10 +08:00
morris
d81c659cf1
Merge branch 'srmao/esp_driver_dma_esp32p4_rev1_tests_v6.0' into 'release/v6.0'
...
test(esp_driver_dma): add esp32p4 rev1 test apps (v6.0)
See merge request espressif/esp-idf!48942
2026-06-29 10:07:35 +08:00
morris
d3804f59f0
Merge branch 'test/enable_isp_test_esp32p4_rev1_v6.0' into 'release/v6.0'
...
fix(isp): enable esp32p4_rev1 unit test (v6.0)
See merge request espressif/esp-idf!49230
2026-06-29 10:07:16 +08:00
morris
61d37229e1
Merge branch 'fix/i2c-linux-include-dir' into 'release/v6.0'
...
fix: update i2c linux include dir
See merge request espressif/esp-idf!49877
2026-06-29 10:06:28 +08:00
Laukik Hase
9ce63d8dfa
fix(esp_tee): Add additional input validation checks for TEE service calls
2026-06-26 17:59:26 +05:30
Laukik Hase
00cff977c6
fix(esp_tee): Avoid crypto peripherals reset with esp_restart() from REE
...
- Reset the crypto peripherals during TEE initialization
2026-06-26 15:07:23 +05:30
Laukik Hase
e1bbb70278
fix(esp_tee): Prevent TEE from dispatching the REE heap poisoning callback
2026-06-26 15:07:22 +05:30
C.S.M
2aaee66a9a
fix(jpeg): Fix the jpeg size might exceed the buffer size
2026-06-26 11:02:58 +08:00
Ashish Sharma
64b488ebb3
fix(esp_http_server): take ctrl_sock_semaphore on shutdown and async wake
...
httpd_stop() and httpd_req_async_handler_complete() both pushed
messages onto the control mbox via cs_send_to_ctrl_sock() without
reserving a slot in ctrl_sock_semaphore. Once the silent-drop fix
made the semaphore unconditional, the bypass became a real bug:
when the mbox is saturated by pending httpd_queue_work() items the
unguarded sendto() can return ENOBUFS, and even when it succeeds it
leaves the semaphore overstating free slots until the consumer
drains the message — a window during which a concurrent
httpd_queue_work() can take a slot but still find the mbox full.
Acquire the semaphore (portMAX_DELAY) before both sends and give it
back on send failure so the take/give invariant is preserved. The
httpd task is the consumer in both paths, so blocking is bounded
and deadlock-free. Reword the stale "no-op give on full" comment in
httpd_process_ctrl_msg() to reflect that only the recv-error path
relies on the cap behavior now.
2026-06-25 10:41:17 +08:00
Ashish Sharma
8939340af8
fix(esp_http_server): prevent silent message drop in httpd_queue_work
...
Closes https://github.com/espressif/esp-idf/issues/18563
2026-06-25 10:41:17 +08:00
Chen Jichang
0813ea75b4
fix(gdma): fix buffer alignment when psram ecc enabled
...
Closes https://github.com/espressif/esp-idf/issues/18739
2026-06-25 10:29:01 +08:00
wanckl
14b5df881a
feat(driver_twai): add prioritized TX queue support
2026-06-24 14:15:51 +08:00
wanckl
ec31ba1c6c
feat(driver_twai): support using all 4 hardware tx buffer
2026-06-24 14:15:51 +08:00
wanckl
15a1a86a0a
fix(driver_twai): fixed twaifd slow bitrate trans faile on correct bitrate
2026-06-24 14:15:51 +08:00
Wan Lei
9f694876bf
fix(driver_twai): enable ci test for h4
2026-06-24 14:15:51 +08:00
wanckl
8500535a86
fix(driver_twai): fix driver assert fail when send frame
...
Closes https://github.com/espressif/esp-idf/issues/18081
2026-06-24 14:15:51 +08:00
wanckl
b14a480d59
fix(driver_sdmmc): test app correct p4 sdkconfig
2026-06-24 14:01:58 +08:00
wanckl
35fb412e71
fix(ci): twai test close board to fixed ci jobs pullotion
2026-06-23 14:27:46 +08:00