From 06274ff5a5613a3690e61082475eb32dffe025a1 Mon Sep 17 00:00:00 2001
From: Wu Jian Gang <wujiangang@espressif.com>
Date: Fri, 3 Mar 2017 20:58:49 +0800
Subject: [PATCH 1/3] Merge branch 'bugfix/fix_mpdu_len_error' into 'master'

esp32: update wifi lib to fix mpdu len error

Fix mpdu len error which impact espressif smartconfig

See merge request !552
---
 components/esp32/lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/esp32/lib b/components/esp32/lib
index 57b2234ed3..e874335580 160000
--- a/components/esp32/lib
+++ b/components/esp32/lib
@@ -1 +1 @@
-Subproject commit 57b2234ed3a501ddbc36bdc032e1714d2838608d
+Subproject commit e8743355806ed3671f7b0ef8bac1ea63909daaf3

From c01dff82630d816c835fc7b4a7610c14684a25e8 Mon Sep 17 00:00:00 2001
From: Ivan Grokhotkov <ivan@espressif.com>
Date: Fri, 3 Mar 2017 17:41:58 +0800
Subject: [PATCH 2/3] Merge branch 'feature/run_test_on_release_branches' into
 'master'

CI: support running CI test on release branches

Patches will be cherry-picked to release branches after it's released. Therefore we need to run test jobs with the same strategy as master.

See merge request !551
---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 96bc56e3e6..c654770517 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -167,6 +167,7 @@ test_report:
   only:
     - master
     - triggers
+    - /^release\/v.*$/
   tags:
     - report
   variables:
@@ -287,6 +288,7 @@ check_doc_links:
   when: on_success
   only:
     - master
+    - /^release\/v.*$/
     - triggers
   allow_failure: true
 

From abe8e405976599f7717d6c24f067507c3c08b958 Mon Sep 17 00:00:00 2001
From: Ivan Grokhotkov <ivan@espressif.com>
Date: Sat, 4 Mar 2017 18:17:59 +0800
Subject: [PATCH 3/3] ci: fix release branch being pushed into master

Also fix variable quoting issue in link check build.
---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c654770517..27663db32b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -232,7 +232,7 @@ push_master_to_github:
     - chmod 600 ~/.ssh/id_rsa
     - echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
     - git remote add github git@github.com:espressif/esp-idf.git
-    - git push --follow-tags github HEAD:master
+    - git push --follow-tags github HEAD
 
 
 deploy_docs:
@@ -270,7 +270,7 @@ check_doc_links:
     - triggers
   script:
     # must be triggered with CHECK_LINKS=Yes, otherwise exit without test
-    - test $CHECK_LINKS = "Yes" || exit 0
+    - test "$CHECK_LINKS" = "Yes" || exit 0
     # can only run on master branch (otherwise the commit is not on Github yet)
     - test "${CI_BUILD_REF_NAME}" = "master" || exit 0
     - cd docs