CVS Update@oss.sgi.com: linux

[Ralf Baechle <ralf@oss.sgi.com>]

CVSROOT:        /home/pub/cvs
Module name:    linux
Changes by:     ralf@oss.sgi.com        00/04/18 21:00:25

Modified files:
        .              : CREDITS MAINTAINERS Makefile Rules.make 
        Documentation  : Configure.help sysrq.txt 
        Documentation/DocBook: Makefile kernel-api.tmpl 
        Documentation/arm/SA1100: Brutus 
        Documentation/filesystems: ntfs.txt 
        Documentation/sound: CMI8330 SoundPro 
        Documentation/usb: CREDITS acm.txt ibmcam.txt ov511.txt 
                           proc_usb_info.txt scanner-hp-sane.txt 
                           scanner.txt 
        Documentation/video4linux/bttv: CARDLIST 
        arch/alpha     : config.in defconfig 
        arch/alpha/boot: Makefile 
        arch/alpha/kernel: Makefile irq_i8259.c osf_sys.c 
        arch/arm       : Makefile config.in defconfig 
        arch/arm/boot/compressed: head-sa1100.S 
        arch/arm/def-configs: brutus footbridge 
        arch/arm/kernel: Makefile arch.c armksyms.c bios32.c 
                         entry-armv.S process.c setup.c 
        arch/arm/lib   : Makefile 
        arch/arm/mm    : Makefile mm-armv.c mm-sa1100.c proc-sa110.S 
        arch/i386      : config.in defconfig 
        arch/i386/boot/compressed: head.S 
        arch/i386/kernel: Makefile acpi.c head.S irq.c mtrr.c pci-i386.c 
                          pci-pc.c setup.c 
        arch/i386/lib  : Makefile 
        arch/i386/math-emu: Makefile 
        arch/ia64      : config.in defconfig 
        arch/ia64/boot : Makefile 
        arch/ia64/dig  : Makefile 
        arch/ia64/ia32 : Makefile sys_ia32.c 
        arch/ia64/kdb  : Makefile 
        arch/ia64/kernel: Makefile 
        arch/ia64/lib  : Makefile 
        arch/ia64/sn   : Makefile 
        arch/ia64/sn/sn1: Makefile 
        arch/m68k      : config.in defconfig 
        arch/m68k/fpsp040: Makefile 
        arch/m68k/ifpsp060: Makefile 
        arch/m68k/kernel: Makefile 
        arch/m68k/lib  : Makefile 
        arch/m68k/math-emu: Makefile 
        arch/m68k/sun3 : Makefile 
        arch/mips      : config.in defconfig defconfig-decstation 
                         defconfig-ip22 
        arch/mips/kernel: sysirix.c 
        arch/mips64    : config.in defconfig defconfig-ip22 
                         defconfig-ip27 
        arch/mips64/sgi-ip27: ip27-memory.c 
        arch/ppc       : Makefile config.in defconfig 
        arch/ppc/8xx_io: enet.c uart.c 
        arch/ppc/boot  : Makefile 
        arch/ppc/chrpboot: Makefile 
        arch/ppc/kernel: feature.c m8xx_setup.c 
        arch/ppc/lib   : Makefile 
        arch/ppc/math-emu: math.c sfp-machine.h 
        arch/ppc/mbxboot: Makefile 
        arch/ppc/mm    : fault.c 
        arch/sh        : Makefile config.in defconfig 
        arch/sh/kernel : Makefile entry.S fpu.c head.S irq.c irq_imask.c 
                         process.c ptrace.c signal.c 
        arch/sh/lib    : Makefile 
        arch/sh/mm     : cache.c fault.c init.c 
        arch/sparc     : config.in defconfig 
        arch/sparc/kernel: Makefile ioport.c setup.c signal.c 
                           sys_sunos.c 
        arch/sparc/lib : Makefile 
        arch/sparc/math-emu: Makefile 
        arch/sparc/mm  : Makefile sun4c.c 
        arch/sparc64   : config.in defconfig 
        arch/sparc64/kernel: Makefile dtlb_base.S dtlb_prot.S ebus.c 
                             entry.S etrap.S ioctl32.c itlb_base.S 
                             pci_common.c pci_impl.h pci_psycho.c 
                             pci_sabre.c process.c rtrap.S semaphore.c 
                             signal.c signal32.c smp.c sparc64_ksyms.c 
                             sys32.S sys_sparc32.c sys_sunos32.c 
                             winfixup.S 
        arch/sparc64/lib: Makefile VIScopy.S blockops.S 
        arch/sparc64/mm: Makefile fault.c ultra.S 
        arch/sparc64/prom: Makefile 
        arch/sparc64/solaris: Makefile fs.c misc.c socksys.c timod.c 
        drivers/acorn/char: keyb_ps2.c 
        drivers/acorn/scsi: acornscsi.h arxescsi.c arxescsi.h cumana_2.c 
                            cumana_2.h eesox.c eesox.h fas216.c fas216.h 
                            msgqueue.h powertec.c powertec.h queue.h 
        drivers/atm    : fore200e.c 
        drivers/block  : Config.in ll_rw_blk.c lvm.c md.c nbd.c rd.c 
                         xd.c 
        drivers/block/paride: pcd.c pd.c pf.c 
        drivers/char   : Config.in Makefile applicom.c bttv.c bttv.h 
                         console.c mem.c n_r3964.c pcwd.c ppdev.c pty.c 
                         serial.c sh-sci.c sh-sci.h tty_io.c tuner.c 
                         videodev.c wd501p.h 
        drivers/char/agp: agpgart_be.c 
        drivers/char/joystick: joy-spaceball.c joy-spaceorb.c 
                               joy-warrior.c joystick.c 
        drivers/i2c    : i2c-elektor.c 
        drivers/ide    : ide-disk.c ide-pci.c ide.c 
        drivers/net    : 8390.c Config.in Makefile Space.c defxx.c 
                         defxx.h eepro100.c loopback.c ppp_async.c 
                         ppp_generic.c ppp_synctty.c sunhme.c 
        drivers/net/pcmcia: Config.in Makefile 
        drivers/net/sk98lin: skge.c 
        drivers/net/tokenring: Config.in ibmtr.c 
        drivers/net/wan: cycx_drv.c cycx_main.c cycx_x25.c z85230.c 
        drivers/parport: ChangeLog parport_pc.c parport_sunbpp.c share.c 
        drivers/pci    : gen-devlist.c pci.ids setup-res.c 
        drivers/scsi   : ChangeLog.ncr53c8xx ChangeLog.sym53c8xx 
                         Config.in Makefile esp.c esp.h hosts.c hosts.h 
                         ncr53c8xx.c qlogicisp.c scsi.c sd.c sg.c 
                         sym53c8xx.c sym53c8xx_comm.h wd33c93.c 
        drivers/sound  : Makefile ad1816.c aedsp16.c dev_table.c 
                         dev_table.h mad16.c sb.h sb_card.c sb_common.c 
                         sb_ess.c sb_mixer.c sound_calls.h sound_core.c 
                         soundcard.c trix.c via82cxxx_audio.c 
        drivers/telephony: phonedev.c 
        drivers/usb    : Config.in Makefile acm.c audio.c audio.h 
                         devices.c devio.c drivers.c evdev.c hid.c hub.c 
                         ibmcam.c inode.c input.c joydev.c keybdev.c 
                         mdc800.c mousedev.c ov511.c ov511.h pegasus.c 
                         printer.c scanner.c scanner.h uhci.c uhci.h 
                         usb-core.c usb-debug.c usb-ohci.c usb-storage.c 
                         usb-storage.h usb-uhci.c usb-uhci.h usb.c 
        drivers/usb/serial: Makefile ezusb_convert.pl ftdi_sio.h 
                            usb-serial.h 
        drivers/video  : Config.in Makefile amifb.c aty128fb.c atyfb.c 
                         fbmem.c tgafb.c 
        fs             : Config.in Makefile bad_inode.c dcache.c dquot.c 
                         exec.c file_table.c inode.c ioctl.c locks.c 
                         namei.c open.c read_write.c super.c 
        fs/adfs        : dir.c 
        fs/autofs      : dirhash.c root.c symlink.c 
        fs/autofs4     : expire.c root.c symlink.c 
        fs/devfs       : base.c 
        fs/ext2        : namei.c super.c symlink.c 
        fs/hfs         : dir.c 
        fs/hpfs        : dir.c 
        fs/lockd       : clntlock.c clntproc.c host.c mon.c svc4proc.c 
                         svclock.c svcproc.c svcsubs.c xdr.c xdr4.c 
        fs/ncpfs       : Config.in 
        fs/nfs         : Makefile dir.c file.c flushd.c inode.c 
                         mount_clnt.c nfs2xdr.c nfs3xdr.c nfsroot.c 
                         proc.c read.c symlink.c write.c 
        fs/nfsd        : export.c lockd.c nfs3xdr.c nfsctl.c vfs.c 
        fs/ntfs        : Makefile fs.c 
        fs/partitions  : Config.in 
        fs/proc        : array.c base.c generic.c root.c 
        fs/udf         : file.c inode.c 
        fs/ufs         : symlink.c 
        fs/umsdos      : dir.c 
        include/asm-alpha: namei.h 
        include/asm-arm: checksum.h cpu-multi32.h cpu-single.h namei.h 
        include/asm-arm/arch-arc: system.h 
        include/asm-arm/arch-cl7500: system.h 
        include/asm-arm/arch-ebsa110: hardware.h system.h 
        include/asm-arm/arch-ebsa285: hardware.h system.h 
        include/asm-arm/arch-nexuspci: system.h 
        include/asm-arm/arch-rpc: hardware.h system.h 
        include/asm-arm/arch-sa1100: hardware.h keyboard.h system.h 
        include/asm-arm/proc-armv: pgtable.h 
        include/asm-i386: namei.h 
        include/asm-ia64: namei.h 
        include/asm-m68k: namei.h 
        include/asm-mips: namei.h 
        include/asm-mips64: namei.h 
        include/asm-ppc: namei.h 
        include/asm-sh : bitops.h byteorder.h checksum.h current.h 
                         delay.h mman.h namei.h processor.h ptrace.h 
                         sigcontext.h string.h system.h uaccess.h 
                         unistd.h user.h 
        include/asm-sparc: io.h namei.h page.h pgtable.h 
        include/asm-sparc64: asm_offsets.h bitops.h io.h namei.h pbm.h 
                             pgalloc.h pgtable.h processor.h system.h 
        include/linux  : blk.h blkdev.h bootmem.h cycx_x25.h dcache.h 
                         errno.h fs.h if_ppp.h input.h mm.h mmzone.h 
                         mount.h nbd.h net.h nfs.h nfs3.h nfs_fs.h 
                         nfs_fs_i.h nfs_fs_sb.h nfs_mount.h pci.h 
                         ppp_channel.h proc_fs_i.h sched.h skbuff.h 
                         swap.h tty.h udf_fs.h usb.h 
        include/linux/lockd: lockd.h nlm.h 
        include/linux/netfilter_ipv4: ip_conntrack.h ip_conntrack_ftp.h 
                                      ip_queue.h ipt_REJECT.h 
        include/linux/nfsd: const.h 
        include/linux/raid: md_u.h 
        include/linux/sunrpc: sched.h svc.h xdr.h 
        include/net    : sock.h tcp.h 
        include/scsi   : sg.h 
        init           : main.c 
        ipc            : shm.c 
        kernel         : acct.c exit.c fork.c kmod.c ksyms.c panic.c 
                         sched.c 
        mm             : bootmem.c filemap.c memory.c numa.c 
                         page_alloc.c slab.c swap_state.c swapfile.c 
                         vmscan.c 
        net            : Config.in Makefile netsyms.c socket.c 
        net/bridge     : br.c br_input.c 
        net/core       : datagram.c dev.c filter.c skbuff.c sock.c 
        net/decnet     : af_decnet.c dn_nsp_in.c dn_nsp_out.c 
        net/ipv4       : af_inet.c icmp.c ip_output.c tcp.c tcp_input.c 
                         tcp_ipv4.c tcp_output.c 
        net/ipv4/netfilter: Config.in Makefile ip_conntrack_core.c 
                            ip_conntrack_ftp.c ip_conntrack_proto_icmp.c 
                            ip_conntrack_proto_tcp.c 
                            ip_conntrack_proto_udp.c 
                            ip_conntrack_standalone.c ip_fw_compat.c 
                            ip_fw_compat_masq.c ip_nat_ftp.c 
                            ip_nat_standalone.c ip_queue.c ip_tables.c 
                            ipchains_core.c ipt_LOG.c ipt_MARK.c 
                            ipt_MASQUERADE.c ipt_MIRROR.c ipt_REDIRECT.c 
                            ipt_REJECT.c ipt_TOS.c ipt_limit.c ipt_mac.c 
                            ipt_mark.c ipt_multiport.c ipt_owner.c 
                            ipt_state.c ipt_tos.c ipt_unclean.c 
        net/ipv6       : icmp.c tcp_ipv6.c 
        net/ipx        : af_spx.c 
        net/khttpd     : security.c sockets.c waitheaders.c 
        net/netlink    : af_netlink.c 
        net/sunrpc     : clnt.c sched.c sunrpc_syms.c svcsock.c xdr.c 
                         xprt.c 
        net/unix       : af_unix.c 
        scripts        : Menuconfig docproc.c gen-all-syms kernel-doc 
Added files:
        Documentation/DocBook: parportbook.tmpl 
        Documentation/arm/SA1100: ThinClient 
        Documentation/sound: PAS16 
        Documentation/usb: input.txt usb-help.txt 
        Documentation/video4linux: README.cpia 
        arch/arm/def-configs: thinclient 
        arch/arm/mm    : mm-shark.c 
        arch/sparc64/lib: bitops.S 
        drivers/char   : cpia.c cpia.h cpia_pp.c cpia_usb.c wdt_pci.c 
        drivers/net/pcmcia: ibmtr_cs.c 
        drivers/scsi   : dmx3191d.c dmx3191d.h 
        drivers/sound/dmasound: .cvsignore Config.in Makefile dmasound.h 
                                dmasound_atari.c dmasound_awacs.c 
                                dmasound_core.c dmasound_paula.c 
                                dmasound_q40.c 
        drivers/usb/serial: ftdi_sio.c keyspan_pda.c usbserial.c visor.c 
                            visor.h whiteheat.c whiteheat_fw.h 
        drivers/video  : sa1100fb.c 
        fs/nfs         : nfs3proc.c 
        fs/ramfs       : .cvsignore Makefile inode.c 
        include/asm-arm/arch-cl7500: vmalloc.h 
        include/asm-arm/arch-ebsa110: vmalloc.h 
        include/asm-arm/arch-ebsa285: vmalloc.h 
        include/asm-arm/arch-nexuspci: vmalloc.h 
        include/asm-arm/arch-rpc: vmalloc.h 
        include/asm-arm/arch-sa1100: vmalloc.h 
        include/asm-arm/arch-shark: dma.h hardware.h ide.h io.h irq.h 
                                    irqs.h keyboard.h memory.h param.h 
                                    processor.h serial.h system.h time.h 
                                    timex.h uncompress.h 
        include/linux  : ibmtr.h nfs2.h nfs_xdr.h usbdevice_fs.h 
        net/ipv4/netfilter: .cvsignore 
        scripts        : checkincludes.pl 
Removed files:
        Documentation/DocBook: parportbook.sgml 
        Documentation/usb: hid.txt 
        drivers/sound  : dmasound.c dmasound.h 
        drivers/usb    : cpia.c cpia.h usbdevice_fs.h 
        drivers/usb/serial: usb-serial.c whiteheat.h 

Log message:
        Merge with Linux 2.3.99-pre4.