On Sun, Oct 9, 2011 at 10:33 AM, Avi Kivity <a...@redhat.com> wrote: > On 10/02/2011 04:26 PM, Avi Kivity wrote: >> >> Please pull from: >> >> git://github.com/avikivity/qemu.git memory/batch >> >> etrax, milkymist, serial conversions. All have already been posted on the >> list. >> >> > > Ping?
Sorry, the recent PPC and LM32 pulls are conflicting: Auto-merging hw/etraxfs_dma.c Auto-merging hw/milkymist-uart.c CONFLICT (content): Merge conflict in hw/milkymist-uart.c Auto-merging hw/openpic.c Auto-merging hw/ppc405_boards.c Auto-merging hw/ppc440_bamboo.c Auto-merging hw/ppce500_mpc8544ds.c CONFLICT (content): Merge conflict in hw/ppce500_mpc8544ds.c Auto-merging hw/virtex_ml507.c Automatic merge failed; fix conflicts and then commit the result.
