8000 Revert "mmc: core: Wait for Vdd to settle on card power off" by erickshepherdNI · Pull Request #237 · ni/linux · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Revert "mmc: core: Wait for Vdd to settle on card power off" #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jun 2, 2025
Merged

Revert "mmc: core: Wait for Vdd to settle on card power off" #237

merged 1 commit into from
Jun 2, 2025

Conversation

erickshepherdNI
Copy link
Contributor
@erickshepherdNI erickshepherdNI commented May 30, 2025 •
edited
Loading

This reverts commit 0905771.

#236 pulls in commit 67bb217 that makes this commit obsolete.

AB#3064782

@erickshepherdNI erickshepherdNI requested a review from gratian May 30, 2025 20:42
@gratian
Copy link
Contributor
gratian commented May 30, 2025

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.

@erickshepherdNI
Copy link
Contributor Author

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.

@erickshepherdNI erickshepherdNI requested a review from chaitu236 June 2, 2025 18:17
@chaitu236
Copy link
Contributor

image

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?

@erickshepherdNI
Copy link
Contributor Author
erickshepherdNI commented Jun 2, 2025 •
edited
Loading

image

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.

@erickshepherdNI erickshepherdNI force-pushed the ershephe/revert-vdd-settling branch from 109cbc4 to 6f0aff3 Compare June 2, 2025 18:32
@erickshepherdNI
Copy link
Contributor Author

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.

@gratian
Copy link
Contributor
gratian commented Jun 2, 2025

@erickshepherdNI can you rebase this so it applies cleanly on top of the latest nilrt/master/6.12?

@erickshepherdNI
Revert "mmc: core: Wait for Vdd to settle on card power off"
ee18e79 
This reverts commit be18357.

Signed-off-by: Erick Shepherd <erick.shepherd@ni.com>
@erickshepherdNI erickshepherdNI force-pushed the ershephe/revert-vdd-settling branch from 6f0aff3 to ee18e79 Compare June 2, 2025 22:55
@gratian gratian merged commit ee18e79 into ni:nilrt/master/6.12 Jun 2, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gratian gratian gratian approved these changes

@chaitu236 chaitu236 chaitu236 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@erickshepherdNI @gratian @chaitu236
0