Merge branch 'master' into feature/modem_sleep

Conflicts:
	components/nvs_flash/src/nvs_api.cpp

diff --cc components/esp32/task_wdt.c
index 3428b2a54c8ca90274e1cb1e3fbea47537f241b5,6f3959125936385aa46a0112b6c2946216a62106..1fcd5ea3924c5aa9ceab6a78d5eb2fea9716e90d
--- 1/components/esp32/task_wdt.c
--- 2/components/esp32/task_wdt.c
+++ b/components/esp32/task_wdt.c
@@@ -161,13 -208,5 +208,5 @@@ void esp_task_wdt_init() 
      ESP_INTR_ENABLE(ETS_T0_WDT_INUM);
  }
  
- #if CONFIG_TASK_WDT_CHECK_IDLE_TASK
- void vApplicationIdleHook(void) {
- #if !CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1
-     if (xPortGetCoreID()!=0) return;
- #endif
-     esp_task_wdt_feed();
- }
- #endif
  
 -#endif
 +#endif