Commit Graph
100 Commits
Author SHA1 Message Date
Jiang Jiang Jian cadfa9c096 Merge branch 'bugfix/rmac_scan_v6.1' into 'release/v6.1'
fix(esp_wifi): fix issues for scan, and NULL packets tx for random mac

See merge request espressif/esp-idf!50928
2026-07-18 22:12:00 +08:00
Jiang Jiang Jian c8e90095fc Merge branch 'bugfix/supplicant_crypto_code_correction_v6.1' into 'release/v6.1'
fix(wpa_supplicant): Correct some functions in crypto porting layer (v6.1)

See merge request espressif/esp-idf!50873
2026-07-18 21:04:55 +08:00
Jiang Jiang Jian 66d5ec660e Merge branch 'bugfix/fix_bredr_inq_crash_v6.1' into 'release/v6.1'
fix(bt/bluedroid): fix crash during bredr inquiry when zero-addr device is found (v6.1)

See merge request espressif/esp-idf!50853
2026-07-18 08:07:38 +08:00
Jiang Jiang Jian e61a30edce Merge branch 'backport/support-esp32s31-dfu-v6.1' into 'release/v6.1'
Feat/support esp32s31 dfu (v6.1)

See merge request espressif/esp-idf!50863
2026-07-18 08:07:22 +08:00
Jiang Jiang Jian ad1d045c69 Merge branch 'bugfix/nan_mem_corruption_v6.1' into 'release/v6.1'
Fix(NAN): fix Memory Corruption due to BIP encryption (Backport v6.1)

See merge request espressif/esp-idf!50883
2026-07-18 02:18:48 +08:00
Jiang Jiang Jian 4752de43dc Merge branch 'bugfix/add_en_rst_in_pvt_func_for_p4_backport_v6.1' into 'release/v6.1'
fix(pvt): add en reset in pvt func for p4 on release v6.1

See merge request espressif/esp-idf!50877
2026-07-18 01:34:50 +08:00
Jiang Jiang Jian aa2e492a8c Merge branch 'fix/esp32p4_secure_boot_sig_block_v6.1' into 'release/v6.1'
fix(esp32p4): secure boot (ECDSA-P384) and flash encryption eFuse fixes (v6.1)

See merge request espressif/esp-idf!50898
2026-07-18 01:32:56 +08:00
Jiang Jiang Jian 0f579637ed Merge branch 'fix/fix_esp_tee_iv_length_check_v6.1' into 'release/v6.1'
feat(esp_tee): ESP-TEE Security Audit fixes (v6.1)

See merge request espressif/esp-idf!50850
2026-07-18 01:31:29 +08:00
Jiang Jiang Jian 88b053119a Merge branch 'doc/bootloader-anti-rollback-fix_v6.1' into 'release/v6.1'
fix(docs): Update bootloader anti-rollback documentation (v6.1)

See merge request espressif/esp-idf!50837
2026-07-17 23:34:48 +08:00
Jiang Jiang Jian a5b5f6f1cc Merge branch 'bugfix/idfci-12737-fatfs-bdl-wl-storage-erase_v6.1' into 'release/v6.1'
fix(fatfs): erase storage partition before bdl_wl CI test (v6.1)

See merge request espressif/esp-idf!50889
2026-07-17 23:20:32 +08:00
Jiang Jiang Jian 9e4684c3bb Merge branch 'bugfix/nvs-flash-erase-partition-leak_v6.1' into 'release/v6.1'
fix(nvs_flash): delete temporary NVSPartition after erase (v6.1)

See merge request espressif/esp-idf!50890
2026-07-17 23:19:59 +08:00
Jiang Jiang Jian 01083b8017 Merge branch 'bugfix/vfs_fat_readdir_stat_cache_v6.1' into 'release/v6.1'
fix(fatfs): move readdir-stat cache to per-DIR stream (v6.1)

See merge request espressif/esp-idf!50903
2026-07-17 23:19:45 +08:00
Jiang Jiang Jian 1513bf3f3d Merge branch 'contrib/github_pr_18822_v6.1' into 'release/v6.1'
fix(esp_partition): prevent size_t overflow bypassing bounds checks on linux target (GitHub PR) (v6.1)

See merge request espressif/esp-idf!50907
2026-07-17 23:19:10 +08:00
Jiang Jiang Jian 392b949368 Merge branch 'contrib/github_pr_18829_v6.1' into 'release/v6.1'
fix(spiffs): fix off-by-one in spiffsgen.py obj name length check (GitHub PR) (v6.1)

See merge request espressif/esp-idf!50914
2026-07-17 23:19:06 +08:00
Jiang Jiang Jian a43c51681a Merge branch 'task/buildv2_full_pipeline_v6.1' into 'release/v6.1'
Enable full buildv2 pipeline (v6.1)

See merge request espressif/esp-idf!50351
2026-07-17 18:20:09 +08:00
Jiang Jiang Jian 522ee6dd74 Merge branch 'contrib/github_pr_18823_v6.1' into 'release/v6.1'
fix(vfs): use MAX_FDS instead of VFS_MAX_COUNT when clearing fd table on unregister (GitHub PR) (v6.1)

See merge request espressif/esp-idf!50697
2026-07-17 18:19:41 +08:00
Jiang Jiang Jian 961539aaa8 Merge branch 'contrib/github_pr_18817_v6.1' into 'release/v6.1'
fix(wear_levelling): guard WL_Flash::write()/read() against size==0 underflow (GitHub PR) (v6.1)

See merge request espressif/esp-idf!50730
2026-07-17 18:19:36 +08:00
Jiang Jiang Jian 0581c1e046 Merge branch 'fix/update_phylib_to_fix_esp32c61_bod_rts_v6.1' into 'release/v6.1'
fix(phy): fix esp32c61 bod rts(backport v6.1)

See merge request espressif/esp-idf!50862
2026-07-17 17:40:16 +08:00
Jiang Jiang Jian 9e9c16c724 Merge branch 'bugfix/change_pvt_timer_target_param_backport_v6.1' into 'release/v6.1'
feat(pvt): change pvt timer target & limit on release v6.1

See merge request espressif/esp-idf!50815
2026-07-17 16:12:52 +08:00
Jiang Jiang Jian e56f3d4c20 Merge branch 'fix/jpeg_enc_encrypt_v6.1' into 'release/v6.1'
fix(jpeg): Jpeg can encode and decode in encryption situation (backport v6.1)

See merge request espressif/esp-idf!50662
2026-07-17 15:57:07 +08:00
Jiang Jiang Jian 997fdc8435 Merge branch 'feat/csi_error_event_v6.1' into 'release/v6.1'
Add MIPI-CSI error event (v6.1)

See merge request espressif/esp-idf!50680
2026-07-17 15:57:04 +08:00
Jiang Jiang Jian 9cf02d6dc4 Merge branch 'fix/fix_coex_iso_cache_error_v6.1' into 'release/v6.1'
fix(coex): Fixed BLE iso coex cache error (6.1)

See merge request espressif/esp-idf!50849
2026-07-17 11:43:27 +08:00
Jiang Jiang Jian f2f57b2922 Merge branch 'fix/do_cache_lock_workaround_before_ipc_stall_v6.1' into 'release/v6.1'
fix(esp_hw_support): disable esp32 livelock workaround before stall another core (v6.1)

See merge request espressif/esp-idf!50768
2026-07-17 11:26:19 +08:00
Jiang Jiang Jian 9adc0ecf8e Merge branch 'backport/spi_slave_add_independent_tx_rx_length-v6.1' into 'release/v6.1'
feat(driver_spi): slave driver support config different tx/rx length (v6.1)

See merge request espressif/esp-idf!49960
2026-07-17 10:54:57 +08:00
Jiang Jiang Jian b3ec1371af Merge branch 'fix/bootloader_anti_rollback_konfig_v6.1' into 'release/v6.1'
fix(bootloader): Hide bootloader anti-rollback Kconfig where not supported (v6.1)

See merge request espressif/esp-idf!50816
2026-07-17 10:54:17 +08:00
Jiang Jiang Jian ec52a0cc95 Merge branch 'feat/tusb_msc_example_sdmmc_esp32s31_backport_v6.1' into 'release/v6.1'
feat(usb_device): Add SDMMC support for MSC USB Device example for esp32s31 target v6.1 backport

See merge request espressif/esp-idf!50827
2026-07-17 10:53:58 +08:00
Jiang Jiang Jian beefc5c263 Merge branch 'feat/idfgh-17859_v6.1' into 'release/v6.1'
backport v6.1: add kconfig option for REGDMA sleep clock ICG

See merge request espressif/esp-idf!50471
2026-07-17 10:45:12 +08:00
Jiang Jiang Jian 07c65b3819 Merge branch 'feature/chip764_power_glitch_support_v6.1' into 'release/v6.1'
feat(s31): bootloader power glitch reset config (v6.1)

See merge request espressif/esp-idf!50545
2026-07-17 10:44:46 +08:00
Jiang Jiang Jian 526285007f Merge branch 'fix/tx_power_validate_v6.1' into 'release/v6.1'
fix(bt): validate BR/EDR TX power against chip-supported range (v6.1)

See merge request espressif/esp-idf!50544
2026-07-17 10:32:04 +08:00
Jiang Jiang Jian 2dd51a0e75 Merge branch 'bugfix/avrc_ca_attr_id_check_v6.1' into 'release/v6.1'
fix(bt): Fix the validation of AVRCP metadata attr_id in handle_rc_attributes_rsp (v6.1)

See merge request espressif/esp-idf!50549
2026-07-17 10:31:02 +08:00
Jiang Jiang Jian f8e6e94dca Merge branch 'feat/usb_dfu_console_soc_caps_backport_v6.1' into 'release/v6.1'
feat(soc): add USB DFU and OTG console caps (backport v6.1)

See merge request espressif/esp-idf!49580
2026-07-17 10:30:26 +08:00
Jiang Jiang Jian 947e534927 Merge branch 'fix/mmap_cache_flash_wr_v6.1' into 'release/v6.1'
fix(mmap): fixed mmap read data wrong when flash being erased/written and cache not disabled (v6.1)

See merge request espressif/esp-idf!50117
2026-07-17 10:30:14 +08:00
Jiang Jiang Jian 14f663f003 Merge branch 'fix/pbkdf2_sha256_mbedtls4_guard_v6.1' into 'release/v6.1'
fix(wpa_supplicant): guard pbkdf2_sha256 for PSA-provided SHA-256 (v6.1)

See merge request espressif/esp-idf!50460
2026-07-16 18:57:43 +08:00
Jiang Jiang Jian 4fe6db39ca Merge branch 'bugfix/bug_bounty_av_v6.1' into 'release/v6.1'
fix(bt/bluedroid): Fix bug bounty issues about A/V from NVIDIA (v6.1)

See merge request espressif/esp-idf!50476
2026-07-16 18:57:38 +08:00
Jiang Jiang Jian adc1f663b4 Merge branch 'feat/add_lmp_dbg_vendor_v6.1' into 'release/v6.1'
feat(bt/controller): Added LMP debug vendor HCI and fixed some bugs ts on ESP32-S31 [backport v6.1]

See merge request espressif/esp-idf!50704
2026-07-16 18:56:58 +08:00
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
Jiang Jiang Jian 76f1151d72 Merge branch 'fix/ble-log-64-bit-io-setup-support_v6.1' into 'release/v6.1'
fix(ble_log): use BIT64 over BIT to support 64-bit IO setup (6.1)

See merge request espressif/esp-idf!50332
2026-07-06 15:51:27 +08:00
Jiang Jiang Jian 264bc73875 Merge branch 'bugfix/fix_ble_chan_compilation_issue_v6.1' into 'release/v6.1'
fix(nimble): Fix ble_chan_sound_reflector compilation issue (v6.1)

See merge request espressif/esp-idf!50363
2026-07-06 15:51:18 +08:00
Jiang Jiang Jian 169aded5b1 Merge branch 'fix/backport_nan_fixes_v6.1' into 'release/v6.1'
Backport NAN features and a few fixes to v6.1 (Backport v6.1)

See merge request espressif/esp-idf!50349
2026-07-04 01:03:16 +08:00
Jiang Jiang Jian 6d021fcbce Merge branch 'task/buildv2_shim_and_ci_v6.1' into 'release/v6.1'
feat(cmakev2): IDF_BUILD_V2 shim + v1-compat layer + buildv2 CI (v6.1)

See merge request espressif/esp-idf!49725
2026-07-03 23:37:50 +08:00
Jiang Jiang Jian edeec716c4 Merge branch 'fix/fix_sleep_cache_writeback_logic_v6.1' into 'release/v6.1'
fix(esp_hw_support): fix esp32s31 sleeping cache writeback logic (v6.1)

See merge request espressif/esp-idf!50347
2026-07-03 22:23:20 +08:00
Jiang Jiang Jian 07c6d5eacf Merge branch 'change/ble_update_lib_20260610_v6.1' into 'release/v6.1'
change(ble): [AUTO_MR] 20260610 - Update ESP BLE Controller Lib (6.1)

See merge request espressif/esp-idf!50227
2026-07-03 21:52:31 +08:00
Jiang Jiang Jian d6d41b0215 Merge branch 'feat/support_esp32s31_icg_control_v6.1' into 'release/v6.1'
feat(esp_hw_support): support PMU clock ICG management for esp32s31 (v6.1)

See merge request espressif/esp-idf!50107
2026-07-03 21:45:42 +08:00
Jiang Jiang Jian 6b557407ab Merge branch 'fix/lp-core-rc-fast-delay_v6.1' into 'release/v6.1'
fix(ulp): use SoC RC_FAST frequency for LP core delay (v6.1)

See merge request espressif/esp-idf!49857
2026-07-03 21:42:19 +08:00
Jiang Jiang Jian a6f24da33e Merge branch 'bugfix/mbedtls_rsa_base_reduction_hw_crt_v6.1' into 'release/v6.1'
fix(mbedlts): Enable hardware CRT for RSA-4096 via base reduction (v6.1)

See merge request espressif/esp-idf!49849
2026-07-03 21:42:10 +08:00
Jiang Jiang Jian fec9fafc0a Merge branch 'bugfix/ulp_lp_core_wakeup_race_v6.1' into 'release/v6.1'
fix(ulp): fix LP core wakeup race with LP timer (v6.1)

See merge request espressif/esp-idf!49561
2026-07-03 21:35:44 +08:00
Jiang Jiang Jian ed3d9f9c46 Merge branch 'bugfix/hfp_example_ci_v6.1' into 'release/v6.1'
fix: Fix the HFP example fails to discovery target device (v6.1)

See merge request espressif/esp-idf!50288
2026-07-03 20:30:56 +08:00
Jiang Jiang Jian d35c053e92 Merge branch 'idf/ble_iso_sec_fixes_v6.1' into 'release/v6.1'
Idf/ble iso sec fixes (v6.1)

See merge request espressif/esp-idf!50231
2026-07-03 20:30:21 +08:00
Jiang Jiang Jian 25c546c1a8 Merge branch 'bugfix/bbp_issues_v6.1' into 'release/v6.1'
Bugfix/bbp issues v6.1

See merge request espressif/esp-idf!50188
2026-07-03 20:29:55 +08:00
Jiang Jiang Jian 7089584a34 Merge branch 'idf/ble_audio_4.4.1_v6.1' into 'release/v6.1'
feat(ble_audio): Support Zephyr LE Audio v4.4.1 (v6.1)

See merge request espressif/esp-idf!50187
2026-07-03 20:28:32 +08:00
Jiang Jiang Jian 2a0dd1921c Merge branch 'contrib/github_pr_18761_v6.1' into 'release/v6.1'
fix(nimble): initialize return value in LED characteristic access cal… (GitHub PR) (v6.1)

See merge request espressif/esp-idf!50150
2026-07-03 20:28:07 +08:00
Jiang Jiang Jian 1bb775f2f1 Merge branch 'fix/lp_core_noreset_under_debug_option_v6.1' into 'release/v6.1'
fix(lp_core): fix build for CONFIG_ULP_NORESET_UNDER_DEBUG=n (v6.1)

See merge request espressif/esp-idf!49866
2026-07-03 20:26:21 +08:00
Jiang Jiang Jian 4c12113aff Merge branch 'backport/49647-v6.1' into 'release/v6.1'
ci: fix pytest markers (backport v6.1)

See merge request espressif/esp-idf!49691
2026-07-03 20:24:16 +08:00
Jiang Jiang Jian 8c79d4b970 Merge branch 'contrib/github_pr_18400_v6.1' into 'release/v6.1'
Improve logging for VFS start_select function (GitHub PR) (v6.1)

See merge request espressif/esp-idf!49549
2026-07-03 20:22:40 +08:00
Jiang Jiang Jian 481813fcd8 Merge branch 'fix/newlib-nano-nosys-linking_v6.1' into 'release/v6.1'
fix(libc): nano: add -lnosys to linking to avoid CMake configuration issues (v6.1)

See merge request espressif/esp-idf!49377
2026-07-03 20:22:23 +08:00
Jiang Jiang Jian 901b57c86c Merge branch 'feature/added_qa_related_vs_cmd_v6.1' into 'release/v6.1'
feat(ble): Updated libble to 6bbfb64 on ESP32-S31 and ESP32-H4 (6.1)

See merge request espressif/esp-idf!50270
2026-07-03 20:02:49 +08:00
Jiang Jiang Jian f89374f464 Merge branch 'lwip/dns_stack_corruption_fix_v6.1' into 'release/v6.1'
fix(dns): Added addr_cnt to DNS resolution to fix multi-IP buffer overflow (v6.1)

See merge request espressif/esp-idf!49191
2026-07-03 18:47:11 +08:00
Jiang Jiang Jian b7193c70e1 Merge branch 'feat/refactor_stdio_vfs_v6.1' into 'release/v6.1'
feat(storage/stdio): refactor stdio vfs (v6.1)

See merge request espressif/esp-idf!48957
2026-07-03 17:47:31 +08:00
Jiang Jiang Jian e3feb73053 Merge branch 'task/buildv2_hygiene_and_dep_declarations_v6.1' into 'release/v6.1'
fix(components): generic dep-declaration and scope-leakage hygiene exposed by cmakev2 (v6.1)

See merge request espressif/esp-idf!48904
2026-07-03 17:47:24 +08:00
Jiang Jiang Jian dc9fc38bfe Merge branch 'backport/master-to-release-6.1-20260701' into 'release/v6.1'
fix(ci): Tolerate w32time already running on Windows CI VMs

See merge request espressif/esp-idf!50264
2026-07-03 10:46:04 +08:00
Jiang Jiang Jian bc42eeed6c Merge branch 'test/vfs_fix_register_check_v6.1' into 'release/v6.1'
test(vfs): Test changes regarding VFS register incorrect check fix and fix VFS host test not being run at all (v6.1)

See merge request espressif/esp-idf!49945
2026-07-03 10:45:43 +08:00
Jiang Jiang Jian 07333f33b0 Merge branch 'bugfix/idfci-12308-fatfs-bdl-test-stack-overflow_v6.1' into 'release/v6.1'
fix(fatfs): avoid stack overflow in BDL diskio partition test (v6.1)

See merge request espressif/esp-idf!50247
2026-07-03 10:45:30 +08:00
Jiang Jiang Jian 271b2cda9b Merge branch 'bugfix/idfci-8839-remove-orphan-test-configs_v6.1' into 'release/v6.1'
fix(fatfs): re-enable fatfs and vfs psram/ccomp CI tests (v6.1)

See merge request espressif/esp-idf!50184
2026-07-03 10:45:17 +08:00
Jiang Jiang Jian 88554f3551 Merge branch 'fix/backport_some_wifi_fixes_v6.1' into 'release/v6.1'
fix(wifi): backport some wifi fixes to v6.1

See merge request espressif/esp-idf!50183
2026-07-02 17:38:57 +08:00
Jiang Jiang Jian cf515d20d7 Merge branch 'feat/support_usb_wakeup_v6.1' into 'release/v6.1'
feat: support usb as wakeup source from light sleep (v6.1)

See merge request espressif/esp-idf!49497
2026-06-30 19:40:33 +08:00
Jiang Jiang Jian f71890ccec Merge branch 'bugfix/ai_review_btu_common_v6.1' into 'release/v6.1'
fix: Fix the critical issues of btu and bt_common from AI review report (v6.1)

See merge request espressif/esp-idf!50121
2026-06-30 17:37:34 +08:00
Jiang Jiang Jian 1e58083bdf Merge branch 'ci/backport-master-6.1-2026-06-29' into 'release/v6.1'
ci: backport master ci to 6.1 (2026-06-29)

See merge request espressif/esp-idf!50157
2026-06-30 14:25:15 +08:00
Jiang Jiang Jian 24d35f4c04 Merge branch 'bugfix/ai_review_a2dp_v6.1' into 'release/v6.1'
fix(bt): Fix the critical issues related to A2DP from AI review report (v6.1)

See merge request espressif/esp-idf!50127
2026-06-30 14:24:19 +08:00
Jiang Jiang Jian 7016e338b6 Merge branch 'feat/optimize_154_debug_v6.1' into 'release/v6.1'
feat(802.15.4): avoid missing abort reason for multievents in 154 debug (v6.1)

See merge request espressif/esp-idf!50120
2026-06-30 14:24:09 +08:00
Jiang Jiang Jian 8264c9589c Merge branch 'bugfix/fix_bluedroid_rpa_whitelist_conn_v6.1' into 'release/v6.1'
Fix connection failure when using RPA with whitelist filtering(ESP32) (6.1)

See merge request espressif/esp-idf!50092
2026-06-30 14:23:29 +08:00