Am 15.04.2012 21:08, schrieb Blue Swirl: > On Tue, Apr 10, 2012 at 22:40, Andreas Färber <afaer...@suse.de> wrote: >> Hello Richard, >> >> This series strips down my Alpha QOM'ification patch from the >> qom-cpu-others.v1 >> RFC series. Subclasses are postponed for now. >> >> Can you please retest and either provide Acked-bys again or send an instant >> PULL? >> >> Available from: >> git://github.com/afaerber/qemu-cpu.git qom-cpu-alpha.v2 >> https://github.com/afaerber/qemu-cpu/commits/qom-cpu-alpha.v2 > > Does not pull anymore: > Auto-merging target-i386/cpu.c > Auto-merging Makefile.target > Auto-merging target-alpha/cpu.h > Auto-merging target-ppc/helper.c > Auto-merging target-ppc/translate_init.c > CONFLICT (content): Merge conflict in target-ppc/translate_init.c > Automatic merge failed; fix conflicts and then commit the result. > > Please rebase.
It wasn't a PULL, preparing one now. Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
