From: Paolo Bonzini <pbonzini@redhat.com>
To: luoyonggang@gmail.com, qemu-level <qemu-devel@nongnu.org>
Subject: Re: Hi Bonzini, I've seen your 3.1 branch have conflict with qemu.org/master
Date: Sun, 20 Sep 2020 18:43:07 +0200 [thread overview]
Message-ID: <413236db-a7ef-542f-5011-892f2291c86d@redhat.com> (raw)
In-Reply-To: <CAE2XoE83rMdELyu5SSb=ysOzgbkSGHsmUVuonGRegkYGCdU9eQ@mail.gmail.com>
On 20/09/20 16:53, 罗勇刚(Yonggang Luo) wrote:
> I rebased 3.1 branch on qemu.org/master <http://qemu.org/master> and
> placed at
> https://github.com/lygstate/qemu/tree/for-3.1
>
> And removed two conflcit revision
>
> * iotests: Work around failing readlink -f
> * Simplify the .gitignore file
>
> And test result at here:
> https://cirrus-ci.com/build/4717093432066048
Great, thanks. I'll send a v2 of the pull request.
Paolo
prev parent reply other threads:[~2020-09-20 16:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-20 14:53 Hi Bonzini, I've seen your 3.1 branch have conflict with qemu.org/master 罗勇刚(Yonggang Luo)
2020-09-20 16:43 ` Paolo Bonzini [this message]
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=413236db-a7ef-542f-5011-892f2291c86d@redhat.com \
--to=pbonzini@redhat.com \
--cc=luoyonggang@gmail.com \
--cc=qemu-devel@nongnu.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;
as well as URLs for NNTP newsgroup(s).