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/07/14 20:32:28

Modified files:
        .              : CREDITS MAINTAINERS Makefile README 
        Documentation  : Changes Configure.help kernel-parameters.txt 
        Documentation/DocBook: parportbook.tmpl 
        Documentation/filesystems: Locking 
        Documentation/networking: tulip.txt 
        Documentation/usb: usb-help.txt 
        arch/alpha/boot/tools: objstrip.c 
        arch/arm       : config.in 
        arch/i386      : config.in defconfig 
        arch/i386/kernel: apm.c microcode.c mtrr.c smp.c visws_apic.c 
        arch/ia64      : config.in 
        arch/ia64/boot : bootloader.c 
        arch/m68k      : config.in 
        arch/m68k/amiga: amisound.c 
        arch/m68k/apollo: dn_ints.c 
        arch/m68k/atari: atakeyb.c joystick.c 
        arch/m68k/bvme6000: rtc.c 
        arch/m68k/mac  : macboing.c 
        arch/m68k/mvme16x: rtc.c 
        arch/mips/cobalt: reset.c 
        arch/mips64/sgi-ip27: ip27-rtc.c ip27-setup.c 
        arch/ppc       : config.in 
        arch/ppc/8xx_io: Config.in commproc.h enet.c uart.c 
        arch/ppc/coffboot: Makefile 
        arch/ppc/kernel: Makefile bitops.c chrp_pci.c chrp_setup.c 
                         chrp_time.c entry.S feature.c gemini_setup.c 
                         head.S idle.c irq.c m8260_setup.c m8xx_setup.c 
                         misc.S oak_setup.c open_pic.c pci.c 
                         pmac_nvram.c pmac_pci.c pmac_pic.c pmac_setup.c 
                         pmac_time.c ppc_ksyms.c prep_setup.c 
                         prep_time.c prom.c setup.c signal.c smp.c 
                         syscalls.c time.c walnut_setup.c 
        arch/ppc/mbxboot: m8xx_tty.c misc.c 
        arch/ppc/mm    : init.c 
        arch/ppc/xmon  : xmon.c 
        arch/s390      : config.in 
        arch/sh        : config.in 
        arch/sparc     : defconfig 
        arch/sparc/kernel: process.c sparc_ksyms.c 
        arch/sparc64   : defconfig 
        arch/sparc64/kernel: binfmt_elf32.c 
        arch/sparc64/solaris: socksys.c timod.c 
        drivers/acpi   : Makefile 
        drivers/block  : acsi_slm.c ll_rw_blk.c lvm.c md.c ps2esdi.c 
                         rd.c 
        drivers/block/paride: paride.c pg.c pt.c 
        drivers/cdrom  : aztcd.c sjcd.c 
        drivers/char   : acquirewdt.c amikeyb.c applicom.c busmouse.c 
                         cyclades.c dn_keyb.c dsp56k.c dtlk.c h8.c 
                         i2c-parport.c i810_rng.c ip2main.c lp.c 
                         mixcomwd.c msp3400.c nvram.c pc110pad.c 
                         pc_keyb.c pcwd.c ppdev.c qpmouse.c raw.c 
                         sbc60xxwdt.c softdog.c tpqic02.c tty_io.c 
                         tvmixer.c videodev.c wdt.c wdt285.c wdt977.c 
                         wdt_pci.c 
        drivers/char/agp: agpgart_fe.c 
        drivers/char/drm: ffb_drv.c gamma_drv.c tdfx_drv.c vm.c 
        drivers/char/ftape/zftape: zftape-init.c 
        drivers/char/joystick: Config.in 
        drivers/char/pcmcia: Config.in 
        drivers/i2c    : i2c-dev.c 
        drivers/i2o    : i2o_config.c 
        drivers/ide    : ide-tape.c 
        drivers/ieee1394: raw1394.c video1394.c 
        drivers/isdn   : isdn_common.c 
        drivers/isdn/avmb1: capi.c 
        drivers/isdn/divert: divert_procfs.c 
        drivers/isdn/hysdn: hysdn_procconf.c hysdn_procfs.c 
                            hysdn_proclog.c 
        drivers/macintosh: adb.c via-pmu.c 
        drivers/mtd    : Config.in Makefile cfi_cmdset_0001.c doc2000.c 
                         doc2001.c docprobe.c mtdblock.c mtdchar.c 
                         mtdcore.c mtdram.c nftl.c nora.c octagon-5066.c 
                         pmc551.c 
        drivers/net    : atari_bionet.c atari_pamsnet.c de4x5.c 
                         ppp_generic.c sk_g16.c 
        drivers/net/pcmcia: xircom_tulip_cb.c 
        drivers/net/tulip: tulip_core.c 
        drivers/net/wan: Makefile cosa.c cycx_main.c 
        drivers/parport: ChangeLog init.c share.c 
        drivers/pcmcia : ds.c 
        drivers/pnp    : isapnp_proc.c 
        drivers/sbus/audio: audio.c 
        drivers/sbus/char: bpp.c flash.c jsflash.c pcikbd.c rtc.c 
                           sunkbd.c sunmouse.c vfc_dev.c 
        drivers/scsi   : pluto.c scsi_scan.c sg.c st.c 
        drivers/sgi/char: graphics.c shmiq.c streamable.c usema.c 
        drivers/sound  : cmpci.c es1370.c es1371.c esssolo1.c 
                         i810_audio.c maestro.c msnd.h msnd_pinnacle.c 
                         sonicvibes.c soundcard.c trident.c 
                         via82cxxx_audio.c vwsnd.c wavfront.c 
        drivers/sound/dmasound: dmasound_core.c 
        drivers/sound/emu10k1: audio.c midi.c 
        drivers/telephony: ixj.c 
        drivers/usb    : Config.in audio.c bluetooth.c dabusb.c dc2xx.c 
                         devices.c evdev.c joydev.c mdc800.c mousedev.c 
                         printer.c usb.c 
        drivers/video  : fbcon-mac.c fbcon.c fbmem.c vesafb.c 
        fs             : block_dev.c dcache.c file_table.c inode.c 
                         pipe.c select.c 
        fs/coda        : dir.c pioctl.c psdev.c 
        fs/devfs       : base.c 
        fs/ext2        : file.c 
        fs/hpfs        : dir.c file.c 
        fs/jffs        : inode-v23.c jffs_fm.c 
        fs/ncpfs       : sock.c 
        fs/nfs         : inode.c 
        fs/nfsd        : vfs.c 
        fs/openpromfs  : inode.c 
        fs/smbfs       : file.c 
        fs/udf         : file.c 
        include/asm-mips64/sn: klconfig.h 
        include/asm-ppc: feature.h hardirq.h heathrow.h machdep.h 
                         mpc8xx.h pci-bridge.h pci.h processor.h prom.h 
                         softirq.h ucontext.h unistd.h vga.h 
        include/asm-s390: elf.h 
        include/asm-sparc: asm_offsets.h bitops.h elf.h 
        include/asm-sparc64: asm_offsets.h elf.h semaphore.h 
        include/linux  : blkdev.h cyclomx.h parport.h pci_ids.h poll.h 
                         usb.h 
        include/linux/mtd: doc2000.h 
        include/linux/netfilter_ipv4: ip_nat_core.h ip_tables.h 
                                      ipt_REJECT.h 
        include/linux/netfilter_ipv6: ip6_tables.h 
        include/video  : fbcon.h 
        kernel         : ksyms.c sched.c 
        mm             : memory.c slab.c vmscan.c 
        net            : socket.c 
        net/atm        : mpoa_proc.c 
        net/core       : netfilter.c 
        net/decnet     : dn_route.c 
        net/ipv4       : tcp_ipv4.c 
        net/ipv4/netfilter: ip_conntrack_core.c 
                            ip_conntrack_standalone.c ip_fw_compat.c 
                            ip_fw_compat_masq.c ip_nat_core.c 
                            ip_nat_standalone.c ip_queue.c ip_tables.c 
                            ipt_REJECT.c 
        net/ipv6       : reassembly.c 
        net/ipv6/netfilter: ip6_tables.c 
        net/irda       : irmod.c 
        net/netlink    : netlink_dev.c 
        net/sched      : sch_cbq.c 
        net/unix       : garbage.c 
        scripts        : Menuconfig 
Added files:
        arch/ppc/kernel: pmac_backlight.c 
        drivers/acpi   : cpu.c driver.c driver.h ec.c os.c sys.c 
                         tables.c 
        drivers/mtd    : cfi_cmdset_0002.c pnc2000.c 
        include/asm-ppc: backlight.h time.h tqm860.h tqm8xxL.h 
Removed files:
        arch/ppc/kernel: time.h 
        drivers/acpi   : osd.c 

Log message:
        Merge with Linux 2.4.0-test5-pre1.  This works again on Origin UP.
        The IP22 cache bugs which are plaguing some machines are still unfixed.