Skip to content

Commit 69d8461

Browse files
drm: Fix build error caused by missing drm_nomodeset.o
The patch for commit 6a2d2dd ("drm: Move nomodeset kernel parameter to the DRM subsystem") was generated with config 'diff.noprefix true'. But later was applied using 'cat nomodeset.mbox | dim apply-branch' on a machine with 'diff.noprefix false'. And command 'git am --scissors -3' as used by the dim tool doesn't handle that case well, since the 3-way merge wrongly resolves the path for new file drivers/gpu/drm/drm_nomodeset.c as gpu/drm/drm_nomodeset.c instead. It led to the following build error as reported by the kernel test robot: make[4]: *** No rule to make target 'drivers/gpu/drm/drm_nomodeset.o', needed by 'drivers/gpu/drm/built-in.a'. Fixes: 6a2d2dd ("drm: Move nomodeset kernel parameter to the DRM subsystem") Reported-by: kernel test robot <[email protected]> Signed-off-by: Javier Martinez Canillas <[email protected]> Reviewed-by: Daniel Vetter <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent db08490 commit 69d8461

File tree

1 file changed

+0
-0
lines changed

1 file changed

+0
-0
lines changed
File renamed without changes.

0 commit comments

Comments
 (0)