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/02/23 16:13:24

Modified files:
        .              : CREDITS MAINTAINERS Makefile 
        Documentation  : Configure.help DMA-mapping.txt magic-number.txt 
        Documentation/filesystems: 00-INDEX 
        Documentation/isdn: 00-INDEX CREDITS HiSax.cert README 
                            README.HiSax README.eicon README.x25 
        Documentation/kbuild: config-language.txt 
        Documentation/networking: decnet.txt 
        Documentation/usb: usb-serial.txt 
        arch/alpha/kernel: Makefile alpha_ksyms.c core_mcpcia.c 
                           core_polaris.c core_pyxis.c core_tsunami.c 
                           entry.S irq.c pci.c pci_iommu.c process.c 
                           proto.h setup.c smp.c sys_alcor.c 
                           sys_cabriolet.c sys_dp264.c sys_eb64p.c 
                           sys_eiger.c sys_jensen.c sys_miata.c 
                           sys_mikasa.c sys_nautilus.c sys_noritake.c 
                           sys_rawhide.c sys_ruffian.c sys_rx164.c 
                           sys_sable.c sys_sio.c sys_sx164.c 
                           sys_takara.c time.c 
        arch/alpha/lib : csum_ipv6_magic.S 
        arch/arm/kernel: armksyms.c entry-common.S irq.c semaphore.c 
        arch/arm/mm    : Makefile init.c proc-arm6,7.S proc-sa110.S 
        arch/arm/nwfpe : fpmodule.c fpsr.h 
        arch/i386      : config.in defconfig 
        arch/i386/boot : bootsect.S setup.S 
        arch/i386/kernel: Makefile acpi.c apic.c apm.c i386_ksyms.c 
                          i8259.c io_apic.c irq.c mpparse.c mtrr.c 
                          pci-dma.c pci-i386.c pci-pc.c process.c 
                          setup.c smp.c 
        arch/i386/mm   : init.c 
        arch/ia64      : config.in 
        arch/ia64/ia32 : ia32_entry.S ia32_signal.c sys_ia32.c 
        arch/ia64/kernel: efi.c entry.S gate.S head.S irq.c irq_lock.c 
                          pci-dma.c pci.c smp.c sys_ia64.c 
        arch/ia64/lib  : Makefile 
        arch/ia64/tools: print_offsets.c 
        arch/m68k      : config.in 
        arch/m68k/atari: joystick.c stram.c 
        arch/m68k/kernel: Makefile entry.S m68k_ksyms.c 
        arch/m68k/mac  : Makefile config.c iop.c macints.c oss.c psc.c 
                         via.c 
        arch/m68k/mm   : motorola.c sun3mmu.c 
        arch/mips      : config.in defconfig 
        arch/mips/jazz : floppy-jazz.c 
        arch/mips/kernel: mips_ksyms.c 
        arch/mips/lib  : floppy-std.c 
        arch/mips/mm   : Makefile andes.c loadmmu.c r2300.c r4xx0.c 
        arch/mips/sni  : dma.c 
        arch/mips64    : defconfig-ip22 
        arch/mips64/kernel: mips64_ksyms.c traps.c 
        arch/mips64/mm : Makefile andes.c loadmmu.c r4xx0.c 
        arch/mips64/sgi-ip22: ip22-berr.c 
        arch/ppc       : config.in defconfig 
        arch/ppc/coffboot: misc.S 
        arch/ppc/configs: common_defconfig gemini_defconfig 
        arch/ppc/kernel: entry.S head.S irq.c misc.S mk_defs.c 
                         open_pic.c pci-dma.c pmac_pic.c pmac_setup.c 
                         pmac_time.c ppc_asm.h ppc_asm.tmpl ppc_ksyms.c 
                         process.c prom.c setup.c smp.c syscalls.c 
                         traps.c 
        arch/ppc/lib   : string.S 
        arch/ppc/mm    : init.c 
        arch/ppc/xmon  : start.c 
        arch/sparc     : defconfig 
        arch/sparc/kernel: ioport.c pcic.c sparc_ksyms.c sys_sparc.c 
                           sys_sunos.c systbls.S 
        arch/sparc/lib : rwsem.S 
        arch/sparc/mm  : fault.c nosun4c.c srmmu.c sun4c.c swift.S 
        arch/sparc64   : config.in defconfig 
        arch/sparc64/kernel: ioctl32.c irq.c pci_iommu.c pci_psycho.c 
                             pci_sabre.c sbus.c smp.c sys_sparc.c 
                             sys_sparc32.c sys_sunos32.c systbls.S 
        arch/sparc64/mm: ultra.S 
        arch/sparc64/solaris: misc.c socksys.c 
        drivers        : Makefile 
        drivers/acorn/block: fd1772.c mfmhd.c 
        drivers/acorn/char: keyb_ps2.c 
        drivers/acorn/net: ether1.c ether1.h ether3.c ether3.h etherh.c 
        drivers/block  : Config.in DAC960.c Makefile acsi.c acsi_slm.c 
                         amiflop.c ataflop.c cpqarray.c cs5530.c 
                         floppy.c genhd.c hd.c icside.c ide-cd.c 
                         ide-disk.c ide-dma.c ide-floppy.c ide-probe.c 
                         ide-tape.c ide.c ll_rw_blk.c loop.c md.c nbd.c 
                         ps2esdi.c raid1.c rd.c swim3.c swim_iop.c xd.c 
        drivers/block/paride: pcd.c pd.c pf.c pg.c pt.c 
        drivers/cdrom  : aztcd.c cdrom.c cdu31a.c cm206.c gscd.c mcd.c 
                         mcdx.c optcd.c sbpcd.c sjcd.c sonycd535.c 
        drivers/char   : Config.in Makefile amikeyb.c console.c dsp56k.c 
                         dtlk.c dz.c esp.c h8.c isicom.c istallion.c 
                         keyboard.c lp.c mem.c misc.c nvram.c pc_keyb.c 
                         pcxx.c ppdev.c pty.c rtc.c serial.c serial167.c 
                         stallion.c sysrq.c tpqic02.c tty_io.c 
                         vc_screen.c videodev.c vme_scc.c vt.c 
                         zr36120_mem.c 
        drivers/char/agp: agp.h 
        drivers/char/ftape/lowlevel: ftape-buffer.c 
        drivers/char/ftape/zftape: zftape-init.c 
        drivers/char/joystick: joystick.c 
        drivers/fc4    : fc.c 
        drivers/i2o    : i2o_block.c 
        drivers/ieee1394: hosts.c hosts.h ieee1394_core.c 
                          ieee1394_syms.c ohci1394.c ohci1394.h 
                          pcilynx.h raw1394.c 
        drivers/isdn   : Config.in Makefile isdn_common.c isdn_common.h 
                         isdn_net.c isdn_ppp.c isdn_tty.c isdn_tty.h 
                         isdn_ttyfax.c 
        drivers/isdn/avmb1: Makefile avmcard.h b1.c b1isa.c b1pci.c 
                            b1pcmcia.c capi.c capidrv.c kcapi.c t1isa.c 
                            t1pci.c 
        drivers/isdn/divert: divert_procfs.c 
        drivers/isdn/eicon: eicon.h eicon_dsp.h eicon_idi.c eicon_idi.h 
                            eicon_io.c eicon_isa.c eicon_isa.h 
                            eicon_mod.c eicon_pci.c eicon_pci.h 
        drivers/isdn/hisax: Makefile arcofi.c arcofi.h asuscom.c 
                            avm_pci.c bkm_a4t.c bkm_a8.c callc.c 
                            config.c diva.c elsa.c fsm.c hfc_2bds0.c 
                            hfc_2bds0.h hfc_2bs0.c hfc_2bs0.h hfc_pci.c 
                            hfcscard.c hisax.h hscx.h ipac.h isac.h 
                            isar.c isar.h isdnl1.c isurf.c l3_1tr6.c 
                            l3dss1.c l3dss1.h netjet.c rawhdlc.c 
                            saphir.c sedlbauer.c sportster.c teleint.c 
                            teles0.c teles3.c telespci.c 
        drivers/macintosh: Makefile adb.c mac_keyb.c macserial.c 
        drivers/net    : 3c505.c 3c505.h 3c507.c 3c509.c 3c515.c 3c523.c 
                         3c527.c 3c59x.c 82596.c 8390.c Config.in 
                         Makefile Space.c a2065.c acenic.c acenic.h 
                         acenic_firmware.h ariadne.c at1700.c atp.c 
                         atp.h bmac.c cops.c cs89x0.c de4x5.c de600.c 
                         de620.c defxx.c depca.c dmfe.c eepro.c 
                         eepro100.c eexpress.c epic100.c eth16i.c 
                         ewrk3.c fmv18x.c gmac.c hydra.c ioc3-eth.c 
                         lance.c ltpc.c mace.c myri_sbus.c ncr885e.c 
                         ne2.c net_init.c ni5010.c ni52.c ni65.c 
                         pcnet32.c plip.c ppp_generic.c rcpci45.c 
                         sb1000.c seeq8005.c setup.c sgiseeq.c sis900.c 
                         sk_g16.c sk_mca.c skeleton.c slip.c smc-mca.c 
                         smc-ultra.c smc-ultra32.c smc9194.c starfire.c 
                         strip.c sunbmac.c sunhme.c sunhme.h sunlance.c 
                         sunqe.c tlan.c tulip.c via-rhine.c wavelan.c 
                         yellowfin.c znet.c 
        drivers/net/arcnet: arc-rimi.c arcnet.c com20020-isa.c 
                            com20020-pci.c com90io.c com90xx.c rfc1201.c 
        drivers/net/fc : iph5526.c 
        drivers/net/hamradio: 6pack.c baycom_epp.c baycom_par.c 
                              baycom_ser_fdx.c baycom_ser_hdx.c 
                              bpqether.c dmascc.c hdlcdrv.c scc.c yam.c 
        drivers/net/hamradio/soundmodem: sm.c 
        drivers/net/irda: irport.c irtty.c nsc-ircc.c toshoboe.c 
                          w83977af_ir.c 
        drivers/net/pcmcia: 3c574_cs.c 3c575_cb.c 3c589_cs.c Config.in 
                            Makefile aironet4500_cs.c fmvj18x_cs.c 
                            netwave_cs.c nmclan_cs.c pcnet_cs.c ray_cs.c 
                            smc91c92_cs.c tulip_cb.c wavelan_cs.c 
                            wavelan_cs.h xirc2ps_cs.c 
        drivers/net/sk98lin: skge.c 
        drivers/net/tokenring: ibmtr.c olympic.c smctr.c tms380tr.c 
        drivers/net/wan: cosa.c cycx_x25.c dlci.c hostess_sv11.c 
                         lapbether.c sbni.c sbni.h sdla.c sdla_chdlc.c 
                         sdla_fr.c sdla_ppp.c sdla_x25.c sealevel.c 
                         x25_asy.c z85230.c z85230.h 
        drivers/parport: parport_pc.c 
        drivers/pci    : pcisyms.c 
        drivers/pcmcia : cs.c cs_internal.h i82365.c tcic.c 
        drivers/sbus   : dvma.c 
        drivers/sbus/audio: audio.c cs4231.c dbri.c 
        drivers/sbus/char: bpp.c pcikbd.c sunkbd.c vfc.h vfc_dev.c 
        drivers/scsi   : Config.in Makefile README.aic7xxx aha152x.c 
                         aic7xxx.c aic7xxx_proc.c aic7xxx_reg.h 
                         aic7xxx_seq.c constants.c eata.c 
                         eata_dma_proc.c esp.c fdomain.c hosts.c hosts.h 
                         mac_esp.c mac_scsi.c mesh.c mvme16x.c pci2000.c 
                         pci2000.h pci2220i.c pci2220i.h psi_dale.h 
                         qla1280.c qlogicfas.c qlogicfc.c qlogicpti.c 
                         scsi.c scsi.h scsi_error.c scsi_ioctl.c 
                         scsi_lib.c scsi_merge.c scsi_obsolete.c 
                         scsi_scan.c scsi_syms.c sd.c sg.c sr.c sr.h 
                         sr_ioctl.c sr_vendor.c st.c st.h sun3_scsi.c 
                         sun3_scsi.h 
        drivers/scsi/aic7xxx: aic7xxx.reg aic7xxx.seq 
        drivers/sgi/char: shmiq.c 
        drivers/sound  : ac97_codec.c ac97_codec.h dmasound.c es1370.c 
                         es1371.c esssolo1.c sb_card.c sonicvibes.c 
                         sound_core.c soundcard.c 
        drivers/usb    : Config.in Makefile acm.c hid-debug.h hid.c 
                         hid.h hub.c inode.c input.c keybdev.c printer.c 
                         scanner.c scanner.h uhci-debug.h usb-core.c 
                         usb-serial.c usb-serial.h usb-uhci.c usb-uhci.h 
                         usb.c 
        drivers/video  : Config.in Makefile aty128fb.c atyfb.c bwtwofb.c 
                         cgsixfb.c fbcon-mac.c fbmem.c igafb.c macfb.c 
                         matroxfb.c 
        fs             : Config.in Makefile attr.c binfmt_elf.c 
                         binfmt_script.c block_dev.c buffer.c 
                         filesystems.c inode.c locks.c open.c 
                         read_write.c super.c 
        fs/adfs        : file.c inode.c map.c 
        fs/affs        : inode.c 
        fs/bfs         : file.c 
        fs/coda        : psdev.c 
        fs/ext2        : inode.c 
        fs/fat         : cache.c 
        fs/hpfs        : namei.c 
        fs/lockd       : Makefile clntproc.c lockd_syms.c svc.c 
                         svclock.c svcproc.c svcsubs.c xdr.c 
        fs/minix       : inode.c 
        fs/ncpfs       : inode.c sock.c 
        fs/nfs         : file.c inode.c 
        fs/nfsd        : lockd.c nfs3xdr.c nfsfh.c nfssvc.c vfs.c 
        fs/openpromfs  : inode.c 
        fs/partitions  : Config.in acorn.c amiga.c atari.c check.c 
                         check.h msdos.c osf.c sgi.c sun.c ultrix.c 
        fs/proc        : inode.c 
        fs/qnx4        : bitmap.c inode.c namei.c 
        fs/smbfs       : inode.c 
        fs/udf         : file.c 
        fs/umsdos      : inode.c namei.c 
        include/asm-alpha: core_mcpcia.h hardirq.h hw_irq.h hwrpb.h 
                           machvec.h page.h pci.h pgalloc.h pgtable.h 
                           smp.h 
        include/asm-arm: cpu-multi32.h cpu-single.h hardirq.h io.h 
                         page.h pci.h pgtable.h semaphore.h softirq.h 
                         unaligned.h 
        include/asm-arm/proc-armo: cache.h semaphore.h 
        include/asm-arm/proc-armv: cache.h 
        include/asm-i386: floppy.h io.h page.h pci.h pgtable.h 
                          processor.h 
        include/asm-ia64: dma.h fpswa.h hardirq.h mmu_context.h 
                          offsets.h page.h pci.h pgtable.h ptrace.h 
                          semaphore.h smp.h softirq.h types.h 
        include/asm-m68k: hardirq.h irq.h macintosh.h macints.h page.h 
                          pgtable.h softirq.h 
        include/asm-mips: io.h offset.h page.h pci.h pgalloc.h pgtable.h 
        include/asm-mips64: elf.h io.h offset.h page.h pci.h pgalloc.h 
                            pgtable.h processor.h ptrace.h 
        include/asm-ppc: elf.h hardirq.h page.h pci.h pgtable.h 
                         posix_types.h processor.h smp.h softirq.h 
                         spinlock.h types.h 
        include/asm-sh : page.h pgtable.h 
        include/asm-sparc: asm_offsets.h hardirq.h page.h pci.h 
                           pgtable.h sbus.h 
        include/asm-sparc64: asm_offsets.h floppy.h hardirq.h io.h 
                             page.h pbm.h pci.h pgtable.h sbus.h 
        include/linux  : adfs_fs_i.h apm_bios.h auto_fs.h ax25.h blk.h 
                         blkdev.h cdrom.h console.h dcache.h fb.h fs.h 
                         genhd.h hdlcdrv.h i2c-id.h ide.h input.h 
                         interrupt.h irq.h isdn.h isdnif.h joystick.h 
                         kbd_kern.h kernelcapi.h kmod.h lists.h lp.h 
                         major.h miscdevice.h mm.h mmzone.h nbd.h 
                         netdevice.h parport.h pci.h pci_ids.h pm.h 
                         sched.h skbuff.h slab.h spinlock.h tty_driver.h 
                         videodev.h 
        include/linux/byteorder: big_endian.h little_endian.h 
                                 pdp_endian.h 
        include/linux/lockd: debug.h lockd.h nlm.h 
        include/linux/nfsd: nfsd.h xdr3.h 
        include/linux/raid: md_k.h 
        include/linux/sunrpc: xdr.h 
        include/net    : ip.h pkt_sched.h profile.h sock.h 
        include/pcmcia : ciscode.h ss.h version.h 
        init           : main.c 
        kernel         : fork.c kmod.c ksyms.c pm.c printk.c ptrace.c 
                         sched.c 
        mm             : filemap.c memory.c mmap.c mremap.c numa.c 
                         page_alloc.c swapfile.c vmscan.c 
        net            : Changes Config.in Makefile README netsyms.c 
                         socket.c sysctl_net.c 
        net/atm        : clip.c 
        net/ax25       : af_ax25.c 
        net/bridge     : Makefile br.c 
        net/core       : dev.c dev_mcast.c profile.c rtnetlink.c 
                         skbuff.c 
        net/decnet     : af_decnet.c 
        net/ipv4       : af_inet.c ipconfig.c tcp_ipv4.c tcp_output.c 
                         tcp_timer.c 
        net/ipv6       : af_inet6.c 
        net/irda       : irda_device.c 
        net/irda/irlan : irlan_client.c irlan_common.c irlan_eth.c 
        net/khttpd     : sockets.c 
        net/netlink    : netlink_dev.c 
        net/netrom     : nr_dev.c 
        net/packet     : af_packet.c 
        net/rose       : rose_dev.c 
        net/sched      : sch_api.c sch_cbq.c sch_generic.c sch_tbf.c 
                         sch_teql.c 
        net/sunrpc     : svcsock.c 
        net/wanrouter  : wanmain.c 
        scripts        : Configure Menuconfig header.tk tkcond.c tkgen.c 
                         tkparse.c tkparse.h 
Added files:
        Documentation  : LVM-HOWTO 
        Documentation/filesystems/devfs: ChangeLog README ToDo 
                                         boot-options mk-devlinks 
                                         modules.conf rc.devfs 
        Documentation/isdn: README.hysdn 
        Documentation/networking: bridge.txt skfp.txt 
        arch/alpha/kernel: i8259.c irq_impl.h 
        arch/arm/mm    : consistent.c 
        arch/i386/kernel: microcode.c 
        arch/m68k/mac  : baboon.c misc.c 
        drivers/block  : README.lvm lvm-snap.c lvm.c 
        drivers/char   : amiserial.c 
        drivers/isdn/avmb1: b1dma.c c4.c 
        drivers/isdn/hisax: hfc_sx.c hfc_sx.h 
        drivers/isdn/hysdn: .cvsignore Makefile boardergo.c boardergo.h 
                            hysdn_boot.c hysdn_defs.h hysdn_init.c 
                            hysdn_net.c hysdn_pof.h hysdn_procconf.c 
                            hysdn_procfs.c hysdn_proclog.c hysdn_sched.c 
                            ince1pc.h 
        drivers/macintosh: adb-iop.c via-macii.c via-maciisi.c 
                           via-pmu68k.c 
        drivers/net    : 8139too.c rtl8129.c 
        drivers/net/skfp: .cvsignore Makefile can.c cfm.c drvfbi.c ecm.c 
                          ess.c fplustm.c hwmtm.c hwt.c lnkstat.c 
                          pcmplc.c pmf.c queue.c rmt.c skfddi.c smt.c 
                          smtdef.c smtinit.c smtparse.c smttimer.c srf.c 
        drivers/net/skfp/h: cmtdef.h fddi.h fddimib.h fplustm.h hwmtm.h 
                            lnkstat.h mbuf.h osdef1st.h sba.h sba_def.h 
                            skfbi.h skfbiinc.h smc.h smt.h smt_p.h 
                            smtstate.h supern_2.h targethw.h targetos.h 
                            types.h 
        drivers/scsi   : sun3_NCR5380.c 
        drivers/scsi/pcmcia: .cvsignore Config.in Makefile 
                             aha152x_stub.c apa1480_stub.c 
                             fdomain_stub.c qlogic_stub.c 
        drivers/usb    : plusb.c plusb.h usb-storage-debug.h 
                         usb-storage.c usb-storage.h 
        drivers/video  : sun3fb.c 
        fs             : tunnel.c 
        fs/devfs       : .cvsignore Makefile base.c util.c 
        fs/lockd       : svc4proc.c xdr4.c 
        include/asm-arm/proc-armv: locks.h 
        include/asm-m68k: adb_iop.h mac_baboon.h 
        include/linux  : devfs_fs.h devfs_fs_kernel.h hysdn_if.h 
                         if_bridge.h lvm.h 
        include/linux/lockd: xdr4.h 
        net/bridge     : br_device.c br_fdb.c br_forward.c br_if.c 
                         br_input.c br_ioctl.c br_notify.c br_private.h 
                         br_private_stp.h br_private_timer.h br_stp.c 
                         br_stp_bpdu.c br_stp_if.c br_stp_timer.c 
Removed files:
        arch/m68k/mac  : adb-bus.c mackeyb.c 
        arch/mips/mm   : r6000.c tfp.c 
        arch/mips64/mm : tfp.c 
        drivers/char   : mac_SCC.c mac_SCC.h 
        drivers/net    : rtl8139.c 
        drivers/usb    : usb_storage.c usb_storage.h usb_storage_debug.c 
        include/asm-arm: md.h 
        include/asm-arm/proc-armv: semaphore.h 
        include/net    : br.h 
        net/bridge     : br_tree.c sysctl_net_bridge.c 

Log message:
        Merge with 2.3.47.  Guys, this is buggy as shit.  You've been warned.