From: Fam Zheng <famz@redhat.com>
To: Su Hang <suhang16@mails.ucas.ac.cn>
Cc: peter.maydell@linaro.org, vsementsov@virtuozzo.com,
qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH v2] scripts/checkpatch.pl: Bug fix
Date: Fri, 16 Mar 2018 15:08:19 +0800 [thread overview]
Message-ID: <20180316070819.GB27549@lemon.usersys.redhat.com> (raw)
In-Reply-To: <55c3c49b.14dfc.1622d81fc86.Coremail.suhang16@mails.ucas.ac.cn>
On Fri, 03/16 14:31, Su Hang wrote:
> Because I generate my first patch on master, it should work.
Nope. "git am" doesn't know to resolve the conflict automatically despite it
being straightforward, unfortunately:
http://patchew.org/QEMU/1521169105-32041-1-git-send-email-suhang16@mails.ucas.ac.cn/
Fam
next prev parent reply other threads:[~2018-03-16 7:08 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-16 2:58 [Qemu-devel] [PATCH v2] scripts/checkpatch.pl: Bug fix Su Hang
2018-03-16 6:15 ` Fam Zheng
2018-03-16 6:31 ` Su Hang
2018-03-16 7:08 ` Fam Zheng [this message]
2018-03-16 7:13 ` Su Hang
-- strict thread matches above, loose matches on Subject: below --
2018-04-03 15:17 [Qemu-devel] [PATCH 0/2 RFC] Implement Hex file loader and add test case Su Hang
2018-04-03 15:17 ` [Qemu-devel] [PATCH v2] scripts/checkpatch.pl: Bug fix Su Hang
2018-04-03 15:29 ` Su Hang
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=20180316070819.GB27549@lemon.usersys.redhat.com \
--to=famz@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=suhang16@mails.ucas.ac.cn \
--cc=vsementsov@virtuozzo.com \
/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;
as well as URLs for NNTP newsgroup(s).