From 5ede2678aa72b0cc7888b54f1f6cefbe39aadd01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Br=C3=A9livet?= <simon+github@brelivet.fr>
Date: Tue, 17 Mar 2020 14:03:03 +0100
Subject: [PATCH 1/2] esp_mqtt: add option to configure mqtt task priority.

Merges https://github.com/espressif/esp-idf/pull/4947
---
 components/mqtt/Kconfig  | 15 +++++++++++++++
 components/mqtt/esp-mqtt |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/components/mqtt/Kconfig b/components/mqtt/Kconfig
index de79975aa..e0d5f318b 100644
--- a/components/mqtt/Kconfig
+++ b/components/mqtt/Kconfig
@@ -78,6 +78,21 @@ menu "ESP-MQTT Configurations"
         help
             MQTT task stack size
 
+    config MQTT_DISABLE_API_LOCKS
+        bool "Disable API locks"
+        default n
+        depends on MQTT_USE_CUSTOM_CONFIG
+        help
+            Default config employs API locks to protect internal structures. It is possible to disable
+            these locks if the user code doesn't access MQTT API from multiple concurrent tasks
+
+    config MQTT_TASK_PRIORITY
+        int "MQTT task priority"
+        default 5
+        depends on MQTT_USE_CUSTOM_CONFIG
+        help
+            MQTT task priority. Higher number denotes higher priority.
+
     config MQTT_TASK_CORE_SELECTION_ENABLED
         bool "Enable MQTT task core selection"
         default false
diff --git a/components/mqtt/esp-mqtt b/components/mqtt/esp-mqtt
index 86fc8b758..d8e208133 160000
--- a/components/mqtt/esp-mqtt
+++ b/components/mqtt/esp-mqtt
@@ -1 +1 @@
-Subproject commit 86fc8b7584f7f3aebf422843d84a26655e485fbe
+Subproject commit d8e20813326cb6c9fe0303fc5ba1813ccca53065

From dea0a75547d5ef600c1553d6f6b0e7e696b69d71 Mon Sep 17 00:00:00 2001
From: David Cermak <cermak@espressif.com>
Date: Tue, 28 Apr 2020 16:30:28 +0200
Subject: [PATCH 2/2] mqtt: clenaup logs and docs, esp_mqtt_abort_connection
 race condition

esp_mqtt_abort_connection: Fixed an issue which could result in a race condition and subsequent crash

esp_mqtt: Change an error print to use ESP_LOGE instead of ESP_LOGI
Move Sending MQTT connect message log from Info to Debug level
docs: Makes clear that publish API could block
Change the message printed after MQTT connection failure
---
 components/mqtt/esp-mqtt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/mqtt/esp-mqtt b/components/mqtt/esp-mqtt
index d8e208133..6bc94add8 160000
--- a/components/mqtt/esp-mqtt
+++ b/components/mqtt/esp-mqtt
@@ -1 +1 @@
-Subproject commit d8e20813326cb6c9fe0303fc5ba1813ccca53065
+Subproject commit 6bc94add892437d0fd50f26bfabe78c646648c13