mirror of
https://github.com/espressif/esp-idf.git
synced 2026-09-22 13:01:16 +03:00
Merge branch 'release/v6.0' into backport-48352-resolve to resolve a conflict in esp_httpd_priv.h between this backport's sdkconfig.h include and the ctrl-socket semaphore's freertos/semphr.h include.