From: Jiang Jiang Jian <jack@espressif.com>
Date: Wed, 16 Jan 2019 13:16:56 +0000 (+0800)
Subject: Merge branch 'mesh/cs_root_conflict' into 'master'
X-Git-Tag: v3.3-beta2~102
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=83447cae90e44bf4214bcbd772709470d2efd6ff;p=esp-idf

Merge branch 'mesh/cs_root_conflict' into 'master'

detect and fix root conflicts when router BSSID is not set

See merge request idf/esp-idf!3869
---

83447cae90e44bf4214bcbd772709470d2efd6ff