Merge in master updates

diff --cc components/esp32/Kconfig
Simple merge

diff --cc components/esp32/cpu_start.c
index 51f6cebb2b98f79dcae56a480bb25a7b165f7fab,5c7a411c8ea69e47f4af12b21a020abe1ab799bf..aecea66ef9abaf451853389cfca6ca71b779a9c1
--- 1/components/esp32/cpu_start.c
--- 2/components/esp32/cpu_start.c
+++ b/components/esp32/cpu_start.c
@@@ -43,9 -43,7 +43,10 @@@
  #include "esp_ipc.h"
  #include "esp_log.h"
  
 +#include "esp_brownout.h"
 +#include "esp_int_wdt.h"
 +#include "esp_task_wdt.h"
+ #include "trax.h"
  
  void start_cpu0(void) __attribute__((weak, alias("start_cpu0_default")));
  void start_cpu0_default(void) IRAM_ATTR;

diff --cc components/freertos/tasks.c
Simple merge