From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:48154)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1VLNgT-0007se-2x
	for qemu-devel@nongnu.org; Sun, 15 Sep 2013 21:33:05 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1VLNgO-0006XJ-B7
	for qemu-devel@nongnu.org; Sun, 15 Sep 2013 21:33:01 -0400
Received: from mx1.redhat.com ([209.132.183.28]:35734)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1VLNgO-0006X6-4D
	for qemu-devel@nongnu.org; Sun, 15 Sep 2013 21:32:56 -0400
Date: Mon, 16 Sep 2013 09:32:44 +0800
From: Fam Zheng <famz@redhat.com>
Message-ID: <20130916013244.GB2700@T430s.nay.redhat.com>
References: <1379066356-14986-1-git-send-email-famz@redhat.com>
	<CAFEAcA9-dnZAzA80NWdfV_G+tgkC_rRja+3so4N9P8VUy3szWg@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAFEAcA9-dnZAzA80NWdfV_G+tgkC_rRja+3so4N9P8VUy3szWg@mail.gmail.com>
Subject: Re: [Qemu-devel] [PATCH v9 0/8] Shared Library Module Support
Reply-To: famz@redhat.com
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
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>, =?iso-8859-1?Q?Llu=EDs?= Vilanova <vilanova@ac.upc.edu>, Richard Henderson <rth@twiddle.net>

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