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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <YJjVw/N7nRlGTVMU@kroah.com>
Date:   Mon, 10 May 2021 08:42:11 +0200
From:   Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To:     Masahiro Yamada <masahiroy@...nel.org>
Cc:     Andrew Morton <akpm@...ux-foundation.org>,
        Miguel Ojeda <ojeda@...nel.org>,
        "Alexander A. Klimov" <grandmaster@...klimov.de>,
        Deepak R Varma <mh12gx2825@...il.com>,
        H Hartley Sweeten <hsweeten@...ionengravers.com>,
        Ian Abbott <abbotti@....co.uk>,
        Qiheng Lin <linqiheng@...wei.com>, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] comedi: remove editor modelines and cruft (again)

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@kernel.org
> 
> Signed-off-by: Masahiro Yamada <masahiroy@...nel.org>
> ---
> 
> I really hope Andrew Morton will use Git.

Nah, quilt is really really good :)

I'll take this in my tree, no worries.

greg k-h