]> git.baikalelectronics.ru Git - kernel.git/commit
drm: Fix build error caused by missing drm_nomodeset.o
authorJavier Martinez Canillas <javierm@redhat.com>
Sat, 27 Nov 2021 19:19:10 +0000 (20:19 +0100)
committerJavier Martinez Canillas <javierm@redhat.com>
Sat, 27 Nov 2021 20:05:58 +0000 (21:05 +0100)
commite96c0d7108750dfcf68713d87e08a2c4cc897389
treed968f5d471d19ef96a346463232766ea5bd1f2fc
parenta638fb11502b18176dab2e64ece60184c4dba8db
drm: Fix build error caused by missing drm_nomodeset.o

The patch for commit aaf698001a2c ("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: aaf698001a2c ("drm: Move nomodeset kernel parameter to the DRM subsystem")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20211127191910.709356-1-javierm@redhat.com
drivers/gpu/drm/drm_nomodeset.c [new file with mode: 0644]
gpu/drm/drm_nomodeset.c [deleted file]