On Sat, Nov 27, 2021 at 08:19:10PM +0100, Javier Martinez Canillas wrote:
> The patch for commit ("6a2d2ddf2c34 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
Huh that's a dangerous setting, I guess a dim patch to check for this and
very loudly complain would be good? Care to type that up? It's no big
deal because strange git settings for dim is pretty much a game of
whack-a-mole, but we should tackle them when they pop up.
> 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: ("6a2d2ddf2c34 drm: Move nomodeset kernel parameter to the DRM subsystem")
> Reported-by: kernel test robot <lkp@xxxxxxxxx>
> Signed-off-by: Javier Martinez Canillas <javierm@xxxxxxxxxx>
Build testing before pushing should be done, not the other way round :-)
Also this is pretty much why we want gitlab CI and real branches.
Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
> ---
>
> {gpu => drivers/gpu}/drm/drm_nomodeset.c | 0
> 1 file changed, 0 insertions(+), 0 deletions(-)
> rename {gpu => drivers/gpu}/drm/drm_nomodeset.c (100%)
>
> diff --git a/gpu/drm/drm_nomodeset.c b/drivers/gpu/drm/drm_nomodeset.c
> similarity index 100%
> rename from gpu/drm/drm_nomodeset.c
> rename to drivers/gpu/drm/drm_nomodeset.c
> --
> 2.33.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
