From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Miguel Ojeda <ojeda@kernel.org>,
"Alexander A. Klimov" <grandmaster@al2klimov.de>,
Deepak R Varma <mh12gx2825@gmail.com>,
H Hartley Sweeten <hsweeten@visionengravers.com>,
Ian Abbott <abbotti@mev.co.uk>, Qiheng Lin <linqiheng@huawei.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] comedi: remove editor modelines and cruft (again)
Date: Mon, 10 May 2021 08:42:11 +0200 [thread overview]
Message-ID: <YJjVw/N7nRlGTVMU@kroah.com> (raw)
In-Reply-To: <20210510063450.412055-1-masahiroy@kernel.org>
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@kernel.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
next prev parent reply other threads:[~2021-05-10 6:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-10 6:34 Masahiro Yamada
2021-05-10 6:42 ` Greg Kroah-Hartman [this message]
2021-05-10 6:53 ` Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YJjVw/N7nRlGTVMU@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=abbotti@mev.co.uk \
--cc=akpm@linux-foundation.org \
--cc=grandmaster@al2klimov.de \
--cc=hsweeten@visionengravers.com \
--cc=linqiheng@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=mh12gx2825@gmail.com \
--cc=ojeda@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®