Revert "mmc: core: Wait for Vdd to settle on card power off"#237
Conversation
|
Can you list the upstream commit that replaces ours? Did you get a conflict during the merge in #236 ? I did not see it listed in the PR description. |
I've gone ahead and updated the PR description with a link to the upstream commit we pulled in. There were no merge conflicts for the merge PR since our current fix and the upstream one are in different files so they are both coexisting currently. |
|
That commit id is for 6.6 but you're trying to merge to 6.12 in which the commit id is be18357. Also, should this also go in 6.6 branch? |
I'll re-create the commit with the proper 6.12 commit ID. I can check if the upstream fix was merged into the 6.6 branch and create another PR to revert this commit if so. |
109cbc4 to
6f0aff3
Compare
|
I checked the 6.6 and it has not merged in the upstream fix yet so I think we should hold off on applying this change there. |
|
@erickshepherdNI can you rebase this so it applies cleanly on top of the latest |
This reverts commit be18357. Signed-off-by: Erick Shepherd <erick.shepherd@ni.com>
6f0aff3 to
ee18e79
Compare


This reverts commit 0905771.
#236 pulls in commit 67bb217 that makes this commit obsolete.
AB#3064782