On 13 September 2013 10:59, Fam Zheng <f...@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-f...@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? thanks -- PMM
