Re: [PATCH] comedi: remove editor modelines and cruft (again)

[Masahiro Yamada]

On Mon, May 10, 2021 at 3:42 PM Greg Kroah-Hartman
<gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
>
> On Mon, May 10, 2021 at 03:34:50PM +0900, Masahiro Yamada wrote:
> > Commit fa60ce2cb450 ("treewide: remove editor modelines and cruft")
> > is different from what I submitted.
> >
> > My original patch [1] did treewide cleanups including the comedi driver.
> >
> > Unfortunately, commit 8ffdff6a8cfb ("staging: comedi: move out of staging
> > directory") moved drivers/staging/comedi/ to drivers/comedi/ before my
> > patch landed on Linus' tree from akpm tree.
> >
> > If Andrew Morton had used Git, 'git merge' would have resolved such file
> > moves properly without any manual intervention.
> >
> > Patches in akpm tree often get broken in his quilt workflows, and then
> > people end up with sending fixup patches.
> >
> > [1] https://lkml.kernel.org/r/20210324054457.1477489-1-masahiroy@xxxxxxxxxx
> >
> > Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
> > ---
> >
> > I really hope Andrew Morton will use Git.
>
> Nah, quilt is really really good :)


git is much much better.   :)




> I'll take this in my tree, no worries.
>
> greg k-h



-- 
Best Regards
Masahiro Yamada