From: Michel <da...@re...> - 2000-11-02 08:54:35
|
Michel Dänzer wrote: > Modified files: > 2.3/drivers/scsi/: 53c7xx.h > > Log message: > patch submitted by Peter De Schrijver to linux-m68k; cleanup > structure definitions This fixed it for Peter on m68k, let's hope it does so for us as well? Can't test it before tomorrow at best. Michel -- Earthling Michel Dänzer (MrCooper) \ CS student and free software enthusiast Debian GNU/Linux (powerpc,i386) user \ member of XFree86 and the DRI project |
From: Roman Z. <zi...@us...> - 2000-11-05 20:52:11
|
CVSROOT: /cvsroot/linux-apus Module name: 2.3 Repository: 2.3/drivers/scsi/ Changes by: zi...@sl.... 00/11/05 12:51:52 Modified files: 2.3/drivers/scsi/: 53c770.c 53c770.h Config.in Makefile Log message: CSPPC driver updates from Fred Heitkamp |
From: Roman Z. <zi...@fh...> - 2000-11-05 21:23:13
|
Hi, > Modified files: > 2.3/drivers/scsi/: 53c770.c 53c770.h Config.in Makefile > > Log message: > CSPPC driver updates from Fred Heitkamp Ok, you can select the driver now and I had to change a few things to get it compiled as module, but untested so far... Fred: Everything that references kernel versions < 2.2.x can be dumped. Look at one of the other 53cxxx drivers. bye, Roman |
From: Roman Z. <zi...@us...> - 2000-11-08 23:27:28
|
CVSROOT: /cvsroot/linux-apus Module name: 2.3 Repository: 2.3/mm/ Changes by: zi...@sl.... 00/11/08 15:27:28 Modified files: ./: Makefile 2.3/Documentation/: Configure.help 2.3/arch/m68k/amiga/: chipram.c config.c 2.3/arch/ppc/: config.in 2.3/arch/ppc/amiga/: config.c 2.3/arch/ppc/kernel/: Makefile head.S ppc_ksyms.c setup.c 2.3/arch/ppc/mm/: init.c 2.3/drivers/net/: ariadne2.c 2.3/drivers/scsi/: Config.in 2.3/drivers/video/: amifb.c cyberfb.c fbmem.c retz3fb.c virgefb.c 2.3/include/asm-ppc/: amigaints.h bootinfo.h io.h pgtable.h 2.3/mm/: page_alloc.c Log message: (first) conflict fixes from import bitkeeper (2.4.0-test10) |
From: Roman Z. <zi...@us...> - 2000-11-09 21:28:54
|
CVSROOT: /cvsroot/linux-apus Module name: 2.3 Repository: 2.3/arch/ppc/mm/ Changes by: zi...@sl.... 00/11/09 13:28:54 Modified files: 2.3/arch/ppc/kernel/: head.S 2.3/arch/ppc/mm/: init.c Log message: mm fixes |
From: Roman Z. <zi...@fh...> - 2000-11-09 22:09:09
|
Hi, On Thu, 9 Nov 2000, Roman Zippel wrote: > Log message: > mm fixes Ok, it seems to work again. Michel, what do you think about a new test kernel? You (maybe) heard Linus! There are no show-stopper bugs. :-) bye, Roman |
From: Michel <dae...@st...> - 2000-11-09 23:10:18
|
Roman Zippel wrote: > Michel, what do you think about a new test kernel? You (maybe) heard > Linus! There are no show-stopper bugs. :-) :) I'd like to have his certainty about code being bug-free... Anyway, I was going to upload a test9 kernel last weekend when the SCSI worked again for me, but then I remembered other problems (PCI on A4000, ...) that I didn't have time to look into. I can build and upload a kernel right away if there is demand, but I can't test it before Friday evening, probably later. Michel -- Earthling Michel Dänzer (MrCooper) \ CS student and free software enthusiast Debian GNU/Linux (powerpc,i386) user \ member of XFree86 and The DRI Project |
From: Roman Z. <zi...@us...> - 2000-11-26 13:11:33
|
CVSROOT: /cvsroot/linux-apus Module name: 2.3 Repository: 2.3/arch/ppc/kernel/ Changes by: zi...@sl.... 00/11/26 05:11:31 Modified files: 2.3/arch/ppc/kernel/: head.S Log message: close comment |
From: Roman Z. <zi...@us...> - 2000-11-26 15:50:17
|
CVSROOT: /cvsroot/linux-apus Module name: 2.3 Repository: 2.3/include/asm-ppc/ Changes by: zi...@sl.... 00/11/26 07:50:12 Modified files: ./: Makefile 2.3/arch/ppc/: config.in 2.3/arch/ppc/kernel/: Makefile head.S ppc_ksyms.c setup.c 2.3/arch/ppc/mm/: init.c 2.3/drivers/scsi/: a2091.c a3000.c 2.3/fs/affs/: inode.c symlink.c 2.3/include/asm-ppc/: io.h Log message: conflict fixes from import bitkeeper (2.4.0-test11) |
From: Roman Z. <zi...@us...> - 2000-11-26 23:59:41
|
CVSROOT: /cvsroot/linux-apus Module name: 2.3 Repository: 2.3/arch/ppc/kernel/ Changes by: zi...@sl.... 00/11/26 15:59:41 Modified files: 2.3/arch/ppc/kernel/: mol.h Log message: boots now with MOL enabled |
From: Roman Z. <zi...@us...> - 2000-11-29 00:35:47
|
CVSROOT: /cvsroot/linux-apus Module name: 2.3 Repository: 2.3/arch/ppc/kernel/ Changes by: zi...@sl.... 00/11/28 16:35:45 Modified files: 2.3/arch/ppc/kernel/: apus_pci.c pci.c Log message: make pci code compile... |
From: Roman Z. <zi...@fh...> - 2000-11-29 09:31:14
|
Hi, > Log message: > make pci code compile... The ppc pci code changed recently, so it would be great if someone could check if my changes make any sense... :-) by, Roman |
From: Michel <dae...@st...> - 2000-11-29 11:19:12
|
Roman Zippel wrote: > > Log message: > > make pci code compile... > > The ppc pci code changed recently, so it would be great if someone could > check if my changes make any sense... :-) Looks good to me (thanks for reorganizing and cleaning up the code!), but I'm not familiar with the new PCI code, maybe Benjamin Herrenschmidt or someone else should have a look at it. The only potential problem I see is that CSPPC_PCI_BRIDGE is not a real PCI bridge, so if the upper PCI code wants to do something with it... Michel -- Earthling Michel Dänzer (MrCooper) \ CS student and free software enthusiast Debian GNU/Linux (powerpc,i386) user \ member of XFree86 and The DRI Project |
From: Michel <mic...@ii...> - 2000-12-27 16:29:51
|
Michel D=E4nzer wrote: >=20 > Roman Zippel wrote: >=20 > > > Log message: > > > make pci code compile... > > > > The ppc pci code changed recently, so it would be great if someone co= uld > > check if my changes make any sense... :-) >=20 > Looks good to me (thanks for reorganizing and cleaning up the code!), b= ut > I'm not familiar with the new PCI code, maybe Benjamin Herrenschmidt or > someone else should have a look at it. Unfortunately, it really doesn't work - the init function seems to run fi= ne, but the PCI config read/write functions are never called so it looks like= we are missing some necessary steps for initialization. I don't have time to= look at it right now. Michel --=20 Earthling Michel D=E4nzer (MrCooper) \ CS student and free software ent= husiast Debian GNU/Linux (powerpc,i386) user \ member of XFree86 and The DRI Pr= oject |
From: Roman Z. <zi...@us...> - 2001-01-12 21:05:21
|
CVSROOT: /cvsroot/linux-apus Module name: 2.3 Repository: 2.3/scripts/usb/ Changes by: zippel@usw-pr-cvs1. 01/01/12 13:05:49 Modified files: ./: Makefile 2.3/Documentation/: Configure.help 2.3/arch/ppc/: Makefile config.in 2.3/arch/ppc/amiga/: config.c 2.3/arch/ppc/kernel/: Makefile apus_setup.c head.S pci.c ppc_ksyms.c setup.c time.c 2.3/arch/ppc/mm/: init.c 2.3/drivers/char/: Makefile 2.3/drivers/net/: Makefile 2.3/drivers/scsi/: Config.in Makefile 2.3/drivers/video/: fbmem.c 2.3/fs/affs/: file.c symlink.c 2.3/include/asm-ppc/: pgtable.h 2.3/mm/: page_alloc.c Removed files: 2.3/BitKeeper/etc/: config logging_ok notify 2.3/Documentation/: IO-APIC.txt 2.3/Documentation/arm/SA1100/: ThinClient 2.3/Documentation/filesystems/devfs/: mk-devlinks modules.conf 2.3/arch/alpha/: vmlinux.lds 2.3/arch/alpha/lib/: callback_init.c semaphore.S srm_dispatch.S srm_fixup.S 2.3/arch/arm/boot/compressed/: head-nexuspci.S 2.3/arch/arm/def-configs/: thinclient 2.3/arch/arm/kernel/: arch.h bios32.h dma-a5k.c dma-dummy.c dma-isa.h dma.h hw-footbridge.c hw-sa1100.c iic.c ioport.c leds-footbridge.c leds-sa1100.c 2.3/arch/arm/lib/: io-ebsa110.S io-footbridge.S 2.3/arch/arm/mm/: map.h mm-shark.c 2.3/arch/i386/kernel/: acpi.c 2.3/arch/ia64/dig/: iosapic.c 2.3/arch/ia64/kdb/: Makefile kdb_bt.c kdb_io.c kdb_traps.c kdbsupport.c pc_keyb.h 2.3/arch/ia64/kernel/: irq_internal.c irq_lock.c pci-dma.c sal_stub.S 2.3/arch/ia64/lib/: idiv.S 2.3/arch/m68k/kernel/: m68k_defs.h 2.3/arch/mips64/: ld.script.elf32 2.3/arch/ppc/8xx_io/: micropatch.c usb.c 2.3/arch/ppc/coffboot/: main.c 2.3/arch/ppc/configs/: gemini_defconfig 2.3/arch/ppc/kernel/: gemini_pci.c gemini_prom.S gemini_setup.c temp.c time.h 2.3/arch/ppc/mbxboot/: mbxtty.c vmlinux.lds 2.3/arch/sh/kernel/: irq_onchip.c 2.3/arch/sparc/kernel/: solaris.c 2.3/drivers/acpi/: osd.c tables.c 2.3/drivers/acpi/include/: actbl32.h actbl64.h common.h config.h debugger.h dispatch.h events.h globals.h hardware.h internal.h interp.h macros.h namesp.h output.h parser.h resource.h tables.h 2.3/drivers/acpi/interpreter/: amdump.c 2.3/drivers/acpi/namespace/: nsdump.c 2.3/drivers/acpi/parser/: psfind.c 2.3/drivers/acpi/tables/: tbtable.c 2.3/drivers/block/: linear.c lvm-snap.c lvm.c md.c raid0.c raid1.c raid5.c xor.c 2.3/drivers/char/: audiochip.h bt848.h bttv-cards.c bttv-driver.c bttv-if.c bttv.c bttv.h buz.c buz.h bw-qcam.c bw-qcam.h c-qcam.c cpia.c cpia.h cpia_pp.c cpia_usb.c cs8420.h i2c-old.c i2c-parport.c ibmmpeg2.h msp3400.c planb.c planb.h pms.c radio-aimslab.c radio-aztech.c radio-cadet.c radio-gemtek.c radio-miropcm20.c radio-rtrack2.c radio-sf16fmi.c radio-terratec.c radio-trust.c radio-typhoon.c radio-zoltrix.c saa5249.c saa7110.c saa7111.c saa7121.h saa7146.h saa7146reg.h saa7185.c saa7196.h stradis.c tda7432.c tda8425.c tda985x.c tda9875.c tea6300.c tea6420.c tuner-3036.c tuner.c tuner.h tvmixer.c videodev.c vino.c zr36057.h zr36060.h zr36120.c zr36120.h zr36120_i2c.c zr36120_mem.c zr36120_mem.h 2.3/drivers/char/drm/: picker.c r128_dma.c 2.3/drivers/char/joystick/: joy-amiga.c joy-analog.c joy-analog.h joy-assassin.c joy-console.c joy-creative.c joy-db9.c joy-gravis.c joy-lightning.c joy-logitech.c joy-magellan.c joy-pci.c joy-sidewinder.c joy-spaceball.c joy-spaceorb.c joy-thrustmaster.c joy-turbografx.c joy-warrior.c joystick.c 2.3/drivers/i2c/: i2c-algo-8xx.c i2c-rpx.c 2.3/drivers/ide/: aec6210.c 2.3/drivers/input/: adbhid.c hid-debug.h hid.c hid.h iforce.c usbkbd.c usbmouse.c wacom.c 2.3/drivers/isdn/avmb1/: b1capi.c b1lli.c 2.3/drivers/isdn/hisax/: foreign.c foreign.h teles3c.c 2.3/drivers/media/video/: stallion.c tda8425.c tda985x.c tea6300.c tea6420.c 2.3/drivers/net/: ncr885_debug.h ncr885e.c ncr885e.h skeleton.c 2.3/drivers/net/hamradio/: 6pack.h pi2.c pt.c 2.3/drivers/net/pcmcia/: 3c575_cb.c 2.3/drivers/sound/: awacs_defs.h dmasound.c dmasound.h softoss.c softoss.h softoss_rs.c soundmodule.h 2.3/drivers/sound/emu10k1/: efxmgr.c osutils.c 2.3/drivers/usb/: adbhid.c evdev.c iforce.c input.c joydev.c keybdev.c m8xxhci.c mousedev.c plusb.h usb-core.c usb-storage-debug.h usb-storage.c usb-storage.h usbdevice_fs.h wmforce.c 2.3/drivers/usb/storage/: scm.c scm.h 2.3/drivers/video/: sisfb.c vga_font.c 2.3/fs/minix/: truncate.c 2.3/include/asm-alpha/: semaphore-helper.h 2.3/include/asm-arm/: dec21285.h ioc.h iomd.h memc.h 2.3/include/asm-arm/arch-arc/: processor.h 2.3/include/asm-arm/arch-cl7500/: processor.h 2.3/include/asm-arm/arch-ebsa285/: processor.h 2.3/include/asm-arm/arch-l7200/: processor.h 2.3/include/asm-arm/arch-nexuspci/: processor.h 2.3/include/asm-arm/arch-rpc/: processor.h 2.3/include/asm-arm/arch-shark/: processor.h 2.3/include/asm-arm/arch-tbox/: processor.h 2.3/include/asm-arm/proc-armo/: io.h semaphore.h 2.3/include/asm-arm/proc-armv/: io.h 2.3/include/asm-ia64/: kdbsupport.h 2.3/include/asm-mips/: highmem.h offset.h 2.3/include/asm-mips64/: highmem.h ioc3.h offset.h 2.3/include/asm-ppc/: gemini.h gemini_serial.h 2.3/include/asm-sparc/: asm_offsets.h atops.h ethtool.h md.h semaphore-helper.h 2.3/include/asm-sparc64/: asm_offsets.h ethtool.h machines.h md.h 2.3/include/linux/: coda_opstats.h dmascc.h i2c-algo-8xx.h openpic.h raid1.h raid5.h 2.3/include/net/: atalkcall.h ax25call.h decnet_call.h ipxcall.h lapbcall.h llccall.h netbeuicall.h nrcall.h p8022call.h psnapcall.h rosecall.h slhc.h spxcall.h x25call.h 2.3/net/: protocols.c 2.3/net/atm/: lane_mpoa_init.c 2.3/net/irda/: irmod.c 2.3/scripts/usb/: procusb usbtree Log message: conflict fixes from import bitkeeper (2.4.0) |
From: Roman Z. <zi...@us...> - 2001-01-12 22:16:34
|
CVSROOT: /cvsroot/linux-apus Module name: 2.3 Repository: 2.3/fs/umsdos/ Changes by: zippel@usw-pr-cvs1. 01/01/12 14:17:01 Removed files: 2.3/fs/: tunnel.c 2.3/fs/autofs4/: inohash.c 2.3/fs/coda/: stats.c 2.3/fs/umsdos/: check.c Log message: conflict fixes from import bitkeeper (2.4.0) |
From: Roman Z. <zi...@us...> - 2001-01-12 22:17:19
|
CVSROOT: /cvsroot/linux-apus Module name: 2.3 Repository: 2.3/fs/minix/ Changes by: zippel@usw-pr-cvs1. 01/01/12 14:17:46 Removed files: 2.3/fs/minix/: fsync.c Log message: conflict fixes from import bitkeeper (2.4.0) |
From: Roman Z. <zi...@us...> - 2001-01-12 23:40:12
|
CVSROOT: /cvsroot/linux-apus Module name: 2.3 Repository: 2.3/drivers/net/ Changes by: zippel@usw-pr-cvs1. 01/01/12 15:40:39 Modified files: 2.3/drivers/net/: 8390.h Log message: ariadne2 config name changed |
From: Roman Z. <zi...@us...> - 2001-01-13 00:38:29
|
CVSROOT: /cvsroot/linux-apus Module name: 2.3 Repository: 2.3/drivers/scsi/ Changes by: zippel@usw-pr-cvs1. 01/01/12 16:38:57 Modified files: 2.3/drivers/scsi/: NCR53C9x.h fastlane.c Log message: add io barriers |
From: Roman Z. <zi...@us...> - 2001-01-16 00:01:41
|
CVSROOT: /cvsroot/linux-apus Module name: 2.3 Repository: 2.3/drivers/net/ Changes by: zippel@usw-pr-cvs1. 01/01/15 16:01:36 Modified files: 2.3/drivers/net/: ariadne2.c Log message: delay request_irq after initialisation |
From: Roman Z. <zi...@us...> - 2001-01-16 00:25:01
|
CVSROOT: /cvsroot/linux-apus Module name: 2.3 Repository: 2.3/drivers/char/ Changes by: zippel@usw-pr-cvs1. 01/01/15 16:24:56 Modified files: 2.3/drivers/char/: ser_a2232.c Log message: block_til_ready changed to gs_block_til_ready |
From: Roman Z. <zi...@us...> - 2001-01-17 20:54:30
|
CVSROOT: /cvsroot/linux-apus Module name: 2.3 Repository: 2.3/drivers/scsi/ Changes by: zippel@usw-pr-cvs1. 01/01/17 12:54:31 Modified files: 2.3/drivers/scsi/: amiga7xx.c Log message: don't try blizzard driver if not present |
From: Roman Z. <zi...@us...> - 2001-01-17 23:04:52
|
CVSROOT: /cvsroot/linux-apus Module name: 2.3 Repository: 2.3/arch/ppc/amiga/ Changes by: zippel@usw-pr-cvs1. 01/01/17 15:04:54 Modified files: 2.3/arch/ppc/amiga/: Makefile Log message: fix typo |
From: Roman Z. <zi...@us...> - 2001-01-17 23:05:46
|
CVSROOT: /cvsroot/linux-apus Module name: 2.3 Repository: 2.3/arch/ppc/ Changes by: zippel@usw-pr-cvs1. 01/01/17 15:05:47 Modified files: 2.3/arch/ppc/: config.in Log message: add pcmcia option |
From: Roman Z. <zi...@us...> - 2001-02-03 22:13:21
|
CVSROOT: /cvsroot/linux-apus Module name: 2.3 Repository: 2.3/scripts/usb/ Changes by: zippel@usw-pr-cvs1. 01/02/03 14:13:27 Modified files: ./: Makefile 2.3/Documentation/: Configure.help 2.3/arch/ppc/: config.in 2.3/arch/ppc/kernel/: pci.c ppc_ksyms.c setup.c time.c 2.3/arch/ppc/mm/: init.c 2.3/drivers/scsi/: NCR53C9x.h 2.3/mm/: page_alloc.c Added files: 2.3/Documentation/: IO-APIC.txt 2.3/Documentation/arm/SA1100/: ThinClient 2.3/Documentation/filesystems/devfs/: mk-devlinks modules.conf 2.3/arch/alpha/: vmlinux.lds 2.3/arch/alpha/lib/: callback_init.c semaphore.S srm_dispatch.S srm_fixup.S 2.3/arch/arm/boot/compressed/: head-nexuspci.S 2.3/arch/arm/def-configs/: thinclient 2.3/arch/arm/kernel/: arch.h bios32.h dma-a5k.c dma-dummy.c dma-isa.h dma.h hw-footbridge.c hw-sa1100.c iic.c ioport.c leds-footbridge.c leds-sa1100.c 2.3/arch/arm/lib/: io-ebsa110.S io-footbridge.S 2.3/arch/arm/mm/: map.h mm-shark.c 2.3/arch/i386/kernel/: acpi.c 2.3/arch/ia64/dig/: iosapic.c 2.3/arch/ia64/kdb/: Makefile kdb_bt.c kdb_io.c kdb_traps.c kdbsupport.c pc_keyb.h 2.3/arch/ia64/kernel/: irq_internal.c irq_lock.c pci-dma.c sal_stub.S 2.3/arch/ia64/lib/: idiv.S 2.3/arch/m68k/kernel/: m68k_defs.h 2.3/arch/mips64/: ld.script.elf32 2.3/arch/ppc/8xx_io/: micropatch.c usb.c 2.3/arch/ppc/coffboot/: main.c 2.3/arch/ppc/configs/: gemini_defconfig 2.3/arch/ppc/kernel/: gemini_pci.c gemini_prom.S gemini_setup.c temp.c time.h 2.3/arch/ppc/mbxboot/: mbxtty.c vmlinux.lds 2.3/arch/sh/kernel/: irq_onchip.c 2.3/arch/sparc/kernel/: solaris.c 2.3/drivers/acpi/: osd.c tables.c 2.3/drivers/acpi/include/: actbl32.h actbl64.h common.h config.h debugger.h dispatch.h events.h globals.h hardware.h internal.h interp.h macros.h namesp.h output.h parser.h resource.h tables.h 2.3/drivers/acpi/interpreter/: amdump.c 2.3/drivers/acpi/namespace/: nsdump.c 2.3/drivers/acpi/parser/: psfind.c 2.3/drivers/acpi/tables/: tbtable.c 2.3/drivers/block/: linear.c lvm-snap.c lvm.c md.c raid0.c raid1.c raid5.c xor.c 2.3/drivers/char/: audiochip.h bt848.h bttv-cards.c bttv-driver.c bttv-if.c bttv.c bttv.h buz.c buz.h bw-qcam.c bw-qcam.h c-qcam.c cpia.c cpia.h cpia_pp.c cpia_usb.c cs8420.h i2c-old.c i2c-parport.c ibmmpeg2.h msp3400.c planb.c planb.h pms.c radio-aimslab.c radio-aztech.c radio-cadet.c radio-gemtek.c radio-miropcm20.c radio-rtrack2.c radio-sf16fmi.c radio-terratec.c radio-trust.c radio-typhoon.c radio-zoltrix.c saa5249.c saa7110.c saa7111.c saa7121.h saa7146.h saa7146reg.h saa7185.c saa7196.h stradis.c tda7432.c tda8425.c tda985x.c tda9875.c tea6300.c tea6420.c tuner-3036.c tuner.c tuner.h tvmixer.c videodev.c vino.c zr36057.h zr36060.h zr36120.c zr36120.h zr36120_i2c.c zr36120_mem.c zr36120_mem.h 2.3/drivers/char/drm/: picker.c r128_dma.c 2.3/drivers/char/joystick/: joy-amiga.c joy-analog.c joy-analog.h joy-assassin.c joy-console.c joy-creative.c joy-db9.c joy-gravis.c joy-lightning.c joy-logitech.c joy-magellan.c joy-pci.c joy-sidewinder.c joy-spaceball.c joy-spaceorb.c joy-thrustmaster.c joy-turbografx.c joy-warrior.c joystick.c 2.3/drivers/i2c/: i2c-algo-8xx.c i2c-rpx.c 2.3/drivers/ide/: aec6210.c 2.3/drivers/input/: adbhid.c hid-debug.h hid.c hid.h iforce.c usbkbd.c usbmouse.c wacom.c 2.3/drivers/isdn/avmb1/: b1capi.c b1lli.c 2.3/drivers/isdn/hisax/: foreign.c foreign.h teles3c.c 2.3/drivers/media/video/: stallion.c tda8425.c tda985x.c tea6300.c tea6420.c 2.3/drivers/net/: ncr885_debug.h ncr885e.c ncr885e.h skeleton.c 2.3/drivers/net/hamradio/: 6pack.h pi2.c pt.c 2.3/drivers/net/pcmcia/: 3c575_cb.c 2.3/drivers/sound/: awacs_defs.h dmasound.c dmasound.h softoss.c softoss.h softoss_rs.c soundmodule.h 2.3/drivers/sound/emu10k1/: efxmgr.c osutils.c 2.3/drivers/usb/: adbhid.c evdev.c iforce.c input.c joydev.c keybdev.c m8xxhci.c mousedev.c plusb.h usb-core.c usb-storage-debug.h usb-storage.c usb-storage.h usbdevice_fs.h wmforce.c 2.3/drivers/usb/storage/: scm.c scm.h 2.3/drivers/video/: sisfb.c vga_font.c 2.3/fs/: tunnel.c 2.3/fs/autofs4/: inohash.c 2.3/fs/coda/: stats.c 2.3/fs/ext2/: truncate.c 2.3/fs/minix/: fsync.c truncate.c 2.3/fs/umsdos/: check.c 2.3/include/asm-alpha/: semaphore-helper.h 2.3/include/asm-arm/: dec21285.h ioc.h iomd.h memc.h 2.3/include/asm-arm/arch-arc/: processor.h 2.3/include/asm-arm/arch-cl7500/: processor.h 2.3/include/asm-arm/arch-ebsa285/: processor.h 2.3/include/asm-arm/arch-l7200/: processor.h 2.3/include/asm-arm/arch-nexuspci/: processor.h 2.3/include/asm-arm/arch-rpc/: processor.h 2.3/include/asm-arm/arch-shark/: processor.h 2.3/include/asm-arm/arch-tbox/: processor.h 2.3/include/asm-arm/proc-armo/: io.h semaphore.h 2.3/include/asm-arm/proc-armv/: io.h 2.3/include/asm-ia64/: kdbsupport.h 2.3/include/asm-mips/: highmem.h offset.h 2.3/include/asm-mips64/: highmem.h ioc3.h offset.h 2.3/include/asm-ppc/: gemini.h gemini_serial.h 2.3/include/asm-sparc/: asm_offsets.h atops.h ethtool.h md.h semaphore-helper.h 2.3/include/asm-sparc64/: asm_offsets.h ethtool.h machines.h md.h 2.3/include/linux/: coda_opstats.h dmascc.h i2c-algo-8xx.h openpic.h raid1.h raid5.h 2.3/include/net/: atalkcall.h ax25call.h decnet_call.h ipxcall.h lapbcall.h llccall.h netbeuicall.h nrcall.h p8022call.h psnapcall.h rosecall.h slhc.h spxcall.h x25call.h 2.3/net/: protocols.c 2.3/net/atm/: lane_mpoa_init.c 2.3/net/irda/: irmod.c 2.3/scripts/usb/: procusb usbtree Log message: conflict fixes from import bitkeeper (2.4.1) |