imx93: fix kernel-imx93-current build — drop redundant blk-ctrl.c hunk (6.18.42) - #10331
Merged
Merged
Conversation
….42) The MBa93xxLA-MINI patch added devm_of_platform_populate() + an of_platform.h include to imx93_blk_ctrl_probe() so the added LCDIF sub-node gets probed. That change is already upstream (mainline imx93-blk-ctrl.c has both), so on the 6.18.42 base the hunk no longer applies and kernel patching fails with "1 out of 2 hunks FAILED" -> failed_apply -> build abort. Remove the blk-ctrl.c changes; keep the DTS additions (imx91_93_common.dtsi LCDIF node + imx93.dtsi), which the base kernel needs and which applied cleanly. Signed-off-by: Igor Pecovnik <igor@armbian.com>
Contributor
📝 WalkthroughWalkthroughThe patch removes the Changesi.MX93 display configuration
Estimated code review effort: 2 (Simple) | ~10 minutes Suggested reviewers: 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes the
kernel-imx93-currentfailure (run 30825508798):Root cause
The MBa93xxLA-MINI patch adds
devm_of_platform_populate()+#include <linux/of_platform.h>toimx93_blk_ctrl_probe()(to probe the added LCDIF sub-node). That change is already upstream — mainlineimx93-blk-ctrl.chas the include (line 10) anddevm_of_platform_populate(dev)(line 360). On the 6.18.42 base the code is already present, so the hunk conflicts.Fix
Drop the
blk-ctrl.cchanges from the patch; keep the DTS additions (imx91_93_common.dtsiLCDIF node +imx93.dtsi), which are still needed and applied cleanly. CI will confirm the patch now applies.Summary by CodeRabbit
New Features
Refactor