From: Fam Zheng <famz@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: "Michael Tokarev" <mjt@tls.msk.ru>,
"QEMU Developers" <qemu-devel@nongnu.org>,
"Alex Bligh" <alex@alex.org.uk>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Lluís Vilanova" <vilanova@ac.upc.edu>,
"Richard Henderson" <rth@twiddle.net>
Subject: Re: [Qemu-devel] [PATCH v9 0/8] Shared Library Module Support
Date: Mon, 16 Sep 2013 09:32:44 +0800 [thread overview]
Message-ID: <20130916013244.GB2700@T430s.nay.redhat.com> (raw)
In-Reply-To: <CAFEAcA9-dnZAzA80NWdfV_G+tgkC_rRja+3so4N9P8VUy3szWg@mail.gmail.com>
On Fri, 09/13 12:31, Peter Maydell wrote:
> On 13 September 2013 10:59, Fam Zheng <famz@redhat.com> wrote:
> > This series implements feature of shared object building as described in:
> >
> > http://wiki.qemu.org/Features/Modules
>
> This doesn't seem to apply to master:
>
> cam-vm-266:precise:qemu$ patches apply
> id:1379066356-14986-1-git-send-email-famz@redhat.com
> Applying: ui/Makefile.objs: delete unnecessary cocoa.o dependency
> Applying: make.rule: fix $(obj) to a real relative path
> Using index info to reconstruct a base tree...
> Falling back to patching base and 3-way merge...
> Auto-merging rules.mak
> Auto-merging configure
> Auto-merging Makefile.objs
> CONFLICT (content): Merge conflict in Makefile.objs
> Auto-merging Makefile
> Failed to merge in the changes.
> Patch failed at 0002 make.rule: fix $(obj) to a real relative path
> When you have resolved this problem run "git am --resolved".
> If you would prefer to skip this patch, instead run "git am --skip".
> To restore the original branch and stop patching run "git am --abort".
>
> Can you rebase?
>
Sure. Looks like master is changed during all these 9 revisions.
Thanks,
Fam
prev parent reply other threads:[~2013-09-16 1:33 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-13 9:59 [Qemu-devel] [PATCH v9 0/8] Shared Library Module Support Fam Zheng
2013-09-13 9:59 ` [Qemu-devel] [PATCH v9 1/8] ui/Makefile.objs: delete unnecessary cocoa.o dependency Fam Zheng
2013-09-13 9:59 ` [Qemu-devel] [PATCH v9 2/8] make.rule: fix $(obj) to a real relative path Fam Zheng
2013-09-13 9:59 ` [Qemu-devel] [PATCH v9 3/8] rule.mak: allow per object cflags and libs Fam Zheng
2013-09-13 9:59 ` [Qemu-devel] [PATCH v9 4/8] build-sys: introduce common-obj-m and block-obj-m for DSO Fam Zheng
2013-09-13 9:59 ` [Qemu-devel] [PATCH v9 5/8] module: implement module loading Fam Zheng
2013-09-13 14:07 ` Daniel P. Berrange
2013-09-16 1:30 ` Fam Zheng
2013-09-13 14:52 ` Richard Henderson
2013-09-13 16:20 ` Michael Tokarev
2013-09-13 19:43 ` Richard Henderson
2013-09-16 1:41 ` Fam Zheng
2013-09-13 9:59 ` [Qemu-devel] [PATCH v9 6/8] Makefile: install modules with "make install" Fam Zheng
2013-09-13 9:59 ` [Qemu-devel] [PATCH v9 7/8] .gitignore: ignore module related files (dll, so, mo) Fam Zheng
2013-09-13 9:59 ` [Qemu-devel] [PATCH v9 8/8] block: convert block drivers linked with libs to modules Fam Zheng
2013-09-13 11:31 ` [Qemu-devel] [PATCH v9 0/8] Shared Library Module Support Peter Maydell
2013-09-16 1:32 ` Fam Zheng [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=20130916013244.GB2700@T430s.nay.redhat.com \
--to=famz@redhat.com \
--cc=alex@alex.org.uk \
--cc=mjt@tls.msk.ru \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=vilanova@ac.upc.edu \
/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).