From: Laszlo Ersek <lersek@redhat.com>
To: Luiz Capitulino <lcapitulino@redhat.com>
Cc: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH 8/8] OptsVisitor: introduce unit tests, with test cases for range flattening
Date: Mon, 19 Aug 2013 21:55:03 +0200 [thread overview]
Message-ID: <52127817.2040508@redhat.com> (raw)
In-Reply-To: <20130819152622.63c9b86a@redhat.com>
On 08/19/13 21:26, Luiz Capitulino wrote:
> On Mon, 22 Jul 2013 23:07:36 +0200
> Laszlo Ersek <lersek@redhat.com> wrote:
>
>>
>> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
>
> This patch now conflicts, can you respin please?
Can you retry with "git am -3"?
"git rebase -i" didn't ask me to do anything manually, so I'm guessing
if you let "git am" to do a 3-way merge, it should work.
(Of course I don't have anything against posting a v2, this is just an
attempt to keep the traffic low.)
Thanks!
Laszlo
next prev parent reply other threads:[~2013-08-19 19:58 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-22 21:07 [Qemu-devel] [PATCH 0/8] OptsVisitor: support / flatten integer ranges for repeating options Laszlo Ersek
2013-07-22 21:07 ` [Qemu-devel] [PATCH 1/8] OptsVisitor: introduce basic list modes Laszlo Ersek
2013-07-22 21:07 ` [Qemu-devel] [PATCH 2/8] OptsVisitor: introduce list modes for interval flattening Laszlo Ersek
2013-07-22 21:07 ` [Qemu-devel] [PATCH 3/8] OptsVisitor: opts_type_int(): recognize intervals when LM_IN_PROGRESS Laszlo Ersek
2013-07-22 21:07 ` [Qemu-devel] [PATCH 4/8] OptsVisitor: rebase opts_type_uint64() to parse_uint_full() Laszlo Ersek
2013-07-22 21:07 ` [Qemu-devel] [PATCH 5/8] OptsVisitor: opts_type_uint64(): recognize intervals when LM_IN_PROGRESS Laszlo Ersek
2013-07-22 21:07 ` [Qemu-devel] [PATCH 6/8] OptsVisitor: don't try to flatten overlong integer ranges Laszlo Ersek
2013-07-22 21:07 ` [Qemu-devel] [PATCH 7/8] add "test-int128" to .gitignore Laszlo Ersek
2013-07-22 21:07 ` [Qemu-devel] [PATCH 8/8] OptsVisitor: introduce unit tests, with test cases for range flattening Laszlo Ersek
2013-07-22 22:04 ` Eric Blake
2013-07-22 22:24 ` Laszlo Ersek
2013-07-22 22:26 ` Eric Blake
2013-07-22 22:37 ` Laszlo Ersek
2013-08-19 19:26 ` Luiz Capitulino
2013-08-19 19:55 ` Laszlo Ersek [this message]
2013-08-19 20:04 ` Laszlo Ersek
2013-07-29 9:47 ` [Qemu-devel] [PATCH 0/8] OptsVisitor: support / flatten integer ranges for repeating options Laszlo Ersek
2013-07-29 11:01 ` Paolo Bonzini
2013-07-29 11:11 ` Wanlong Gao
2013-07-29 11:30 ` Laszlo Ersek
2013-08-16 7:15 ` Laszlo Ersek
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=52127817.2040508@redhat.com \
--to=lersek@redhat.com \
--cc=lcapitulino@redhat.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).