J. Mayer wrote: > On Sun, 2007-09-16 at 21:08 +0000, Thiemo Seufer wrote: > > CVSROOT: /sources/qemu > > Module name: qemu > > Changes by: Thiemo Seufer <ths> 07/09/16 21:08:06 > > > > Modified files: > > . : Changelog Makefile Makefile.target TODO aes.c > > alpha-dis.c arm-dis.c arm-semi.c block-bochs.c > > block-cloop.c block-cow.c block-dmg.c > > block-qcow.c block-qcow2.c block-raw.c > > block-vmdk.c block-vpc.c block-vvfat.c block.c > > block_int.h bswap.h cocoa.m configure console.c > > cpu-all.h cpu-defs.h cpu-exec.c cutils.c > > dis-asm.h disas.c dyngen-exec.h dyngen.c > > dyngen.h elf.h elf_ops.h exec-all.h exec.c > > gdbstub.c keymaps.c kqemu.c kqemu.h loader.c > > m68k-dis.c m68k-semi.c mips-dis.c monitor.c > > osdep.c ppc-dis.c qemu-doc.texi qemu-img.c > > qemu-img.texi qemu-tech.texi readline.c > > s390-dis.c sdl.c sh4-dis.c softmmu-semi.h > > softmmu_header.h softmmu_template.h sparc-dis.c > > tap-win32.c texi2pod.pl thunk.c thunk.h > > translate-all.c translate-op.c usb-linux.c vl.c > > vl.h vnc.c vnchextile.h > > darwin-user : syscall.c > > fpu : softfloat-native.c > > hw : acpi.c adb.c alpha_palcode.c an5206.c apb_pci.c > > apic.c arm_boot.c arm_gic.c arm_pic.c arm_pic.h > > arm_sysctl.c arm_timer.c cdrom.c cirrus_vga.c > > cirrus_vga_rop.h cirrus_vga_rop2.h cuda.c > > eepro100.c esp.c fdc.c grackle_pci.c gt64xxx.c > > heathrow_pic.c i2c.c i8254.c i8259.c ide.c > > integratorcp.c iommu.c irq.c isa_mmio.c > > jazz_led.c lsi53c895a.c m48t59.c mc146818rtc.c > > mcf5206.c mcf5208.c mcf_fec.c mcf_intc.c > > mcf_uart.c mips_malta.c mips_r4k.c nand.c > > ne2000.c omap.h omap_lcd_template.h openpic.c > > parallel.c pc.c pci.c pci_host.h pckbd.c > > pcnet.c pflash_cfi02.c piix_pci.c pl011.c > > pl050.c pl080.c pl110.c pl110_template.h > > pl181.c pl190.c ppc.c ppc405.h ppc405_boards.c > > ppc405_uc.c ppc_chrp.c ppc_prep.c prep_pci.c > > ps2.c ptimer.c pxa2xx_gpio.c pxa2xx_template.h > > realview.c rtl8139.c sd.c sd.h serial.c > > sh7750.c sh7750_regs.h shix.c slavio_intctl.c > > slavio_misc.c slavio_serial.c slavio_timer.c > > smbus.c smbus.h smbus_eeprom.c smc91c111.c > > sparc32_dma.c sun4m.c sun4u.c tcx.c unin_pci.c > > usb-hid.c usb-hub.c usb-msd.c usb-uhci.c > > usb-wacom.c usb.c usb.h versatile_pci.c > > versatilepb.c vga.c vga_int.h vga_template.h > > vmmouse.c > > keymaps : common de-ch et fr is modifiers nl sv > > linux-user : elfload.c flat.h flatload.c linuxload.c > > m68k-sim.c main.c mmap.c qemu.h signal.c > > syscall.c syscall_defs.h syscall_types.h vm86.c > > linux-user/alpha: syscall_nr.h > > linux-user/ppc : syscall.h > > linux-user/ppc64: syscall.h > > linux-user/sh4 : termbits.h > > linux-user/sparc: termbits.h > > linux-user/sparc64: termbits.h > > linux-user/x86_64: syscall_nr.h > > slirp : COPYRIGHT bootp.c cksum.c debug.c debug.h if.c > > if.h ip_icmp.c ip_input.c ip_output.c > > libslirp.h main.h mbuf.c mbuf.h misc.c misc.h > > sbuf.c sbuf.h slirp.c socket.c socket.h > > tcp_input.c tcp_output.c tcp_subr.c tcp_timer.c > > tftp.c tftp.h udp.c udp.h > > target-alpha : cpu.h exec.h helper.c op.c op_helper.c > > op_helper.h op_helper_mem.h op_mem.h > > op_template.h translate.c > > target-arm : cpu.h exec.h helper.c op.c op_helper.c > > op_iwmmxt.c op_template.h translate.c > > target-arm/nwfpe: double_cpdo.c extended_cpdo.c fpa11.c fpa11.h > > fpa11_cpdo.c fpa11_cpdt.c fpa11_cprt.c > > fpopcode.c fpopcode.h fpsr.h single_cpdo.c > > target-i386 : cpu.h exec.h helper.c helper2.c op.c > > opreg_template.h ops_sse.h ops_template.h > > ops_template_mem.h translate-copy.c translate.c > > target-m68k : cpu.h exec.h helper.c op.c op_helper.c > > translate.c > > target-mips : exec.h fop_template.c helper.c op.c op_helper.c > > op_mem.c op_template.c translate.c > > target-ppc : cpu.h exec.h helper.c mfrom_table.c > > mfrom_table_gen.c op.c op_helper.c op_helper.h > > op_mem.h op_template.h translate.c > > translate_init.c > > target-sh4 : README.sh4 cpu.h exec.h helper.c op.c > > op_helper.c op_mem.c translate.c > > target-sparc : cpu.h fop_template.h helper.c op.c op_helper.c > > op_template.h translate.c > > tests : hello-arm.c linux-test.c qruncom.c runcom.c > > test-i386-code16.S test-i386-muldiv.h > > test-i386-vm86.S test-i386.c test_path.c > > > > Log message: > > find -type f | xargs sed -i 's/[\t ]$//g' # on most files > > Many thanks for generating hundreds of conflicts with a useless commit.
Sorry for causing you trouble. I use in my workflow quilt on top of CVS, so I didn't notice the problem. > Don't know what's wrong in your expression but it did not what you think > it should (and you did not even check....). > > DON'T DO THIS KIND OF COMMIT AGAIN, PLEASE. Actually, I did a second commit to remove the remaining trailing whitspaces. Thiemo