#2083 fix not merged in 4.x? [IDFGH-3018]

Leherenn
Posts: 6
Joined: Tue Mar 24, 2020 3:11 pm

#2083 fix not merged in 4.x? [IDFGH-3018]

Postby Leherenn » Wed Apr 01, 2020 2:24 pm

Hi!

I think I am running into https://github.com/espressif/esp-idf/issues/578 or https://github.com/espressif/esp-idf/issues/2083.
A fix seems to have been found and committed here: https://github.com/espressif/esp-idf/co ... 6f12907b5a
I am running v4.0.

However, I cannot find those options in 4.0 (or the latest master), and running ` git branch -r --contains 7a2885885c25821d8985b6a97798956f12907b5a` yields only: `origin/release/v3.3`

Is it is something that is only needed in the 3.x branch and I am encountering something else, or was it forgotten?

Thank you.

boarchuz
Posts: 238
Joined: Tue Aug 21, 2018 5:28 am

Re: #2083 fix not merged in 4.x?

Postby boarchuz » Wed Apr 01, 2020 8:00 pm

A more recent one here to keep your eye on too: https://github.com/espressif/esp-idf/issues/4916

ESP_Angus
Posts: 2122
Joined: Sun May 08, 2016 4:11 am

Re: #2083 fix not merged in 4.x?

Postby ESP_Angus » Wed Apr 01, 2020 9:00 pm

Hi Leherenn,

Thanks very much for pointing this out. It looks like a failure in our internal development process, a backport of this fix was merged into release/v3.3 branch but the main MR was never merged to master (which was v4.0-dev at the time).

This shouldn't happen, but it happened here by mistake - a contributing factor was that the new SPI flash driver for v4.0 was being added at the same time, and it caused this concurrent fix to be accidentally dropped.

Will fix for the v4.x versions ASAP.


Angus

Leherenn
Posts: 6
Joined: Tue Mar 24, 2020 3:11 pm

Re: #2083 fix not merged in 4.x? [IDFGH-3018]

Postby Leherenn » Thu Apr 02, 2020 6:33 am

Hi Angus.

Thank you for the quick answer, I know how easy it is to miss a cherry-pick.
I can provide the de-merge-conflicted patch if needs be.

Have a great day.

Who is online

Users browsing this forum: Baidu [Spider], Bing [Bot], ESP_Dazz, stdenits and 15 guests