TAKE - merge up to 2.4.8-pre7

[Steve Lord <lord@sgi.com>]

Well, some of this may well be from previous kernel versions, it
appears that our merges are not always catching everything they
should. So this one included an audit of the differences, hopefully
I got them all.

Date:  Thu Aug  9 12:36:15 PDT 2001
Workarea:  jen.americas.sgi.com:/src/lord/xfs-merge

The following file(s) were checked into:
  bonnie.engr.sgi.com:/isms/slinx/2.4.x-xfs


Modid:  2.4.x-xfs:slinx:100471a
linux/drivers/char/drm/radeon.h - 1.1
linux/drivers/char/drm/drm_ioctl.h - 1.1
linux/drivers/char/drm/tdfx.h - 1.1
linux/drivers/char/drm/r128.h - 1.1
linux/drivers/char/drm/mga_warp.c - 1.1
linux/drivers/char/drm/mga_ucode.h - 1.1
linux/drivers/char/drm/mga.h - 1.1
linux/drivers/char/drm/i810.h - 1.1
linux/drivers/char/drm/gamma.h - 1.1
linux/drivers/char/drm/ffb.h - 1.1
linux/drivers/char/drm/drm_vm.h - 1.1
linux/drivers/char/drm/drm_stub.h - 1.1
linux/drivers/char/drm/drm_scatter.h - 1.1
linux/drivers/char/drm/drm_proc.h - 1.1
linux/drivers/char/drm/drm_memory.h - 1.1
linux/drivers/char/drm/drm_lock.h - 1.1
linux/drivers/char/drm/drm_lists.h - 1.1
linux/drivers/char/drm/drm_init.h - 1.1
linux/drivers/char/drm/drm_fops.h - 1.1
linux/drivers/char/drm/drm_drv.h - 1.1
linux/drivers/char/drm/drm_drawable.h - 1.1
linux/drivers/char/drm/drm_dma.h - 1.1
linux/drivers/char/drm/drm_context.h - 1.1
linux/drivers/char/drm/drm_bufs.h - 1.1
linux/drivers/char/drm/drm_auth.h - 1.1
linux/drivers/char/drm/drm_agpsupport.h - 1.1
linux/drivers/char/drm/ati_pcigart.h - 1.1
linux/scripts/Menuconfig - 1.13
linux/net/unix/af_unix.c - 1.32
linux/net/sched/sch_cbq.c - 1.11
linux/net/sched/cls_u32.c - 1.6
linux/net/sched/cls_route.c - 1.5
linux/net/packet/af_packet.c - 1.25
linux/net/netsyms.c - 1.36
linux/net/ipv6/addrconf.c - 1.19
linux/net/ipv4/ip_output.c - 1.24
linux/net/ipv4/igmp.c - 1.15
linux/net/ipv4/icmp.c - 1.20
linux/net/ipv4/af_inet.c - 1.28
linux/net/core/sock.c - 1.22
linux/net/core/skbuff.c - 1.22
linux/net/core/rtnetlink.c - 1.9
linux/mm/vmscan.c - 1.67
linux/mm/page_alloc.c - 1.49
linux/lib/vsprintf.c - 1.12
linux/include/net/addrconf.h - 1.9
linux/include/linux/swap.h - 1.33
linux/include/linux/serial.h - 1.14
linux/include/linux/netdevice.h - 1.27
linux/include/linux/fs.h - 1.106
linux/include/linux/blkdev.h - 1.36
linux/include/asm-sparc64/mmu_context.h - 1.10
linux/include/asm-sparc/pgtable.h - 1.19
linux/include/asm-sparc/bitops.h - 1.12
linux/include/asm-i386/serial.h - 1.5
linux/fs/read_write.c - 1.15
linux/fs/buffer.c - 1.76
linux/drivers/video/cgfourteenfb.c - 1.9
linux/drivers/scsi/sd.c - 1.39
linux/drivers/scsi/qlogicfc.c - 1.19
linux/drivers/scsi/atp870u.c - 1.16
linux/drivers/scsi/aha152x.c - 1.22
linux/drivers/pci/quirks.c - 1.23
linux/drivers/net/sunhme.h - 1.11
linux/drivers/net/sunhme.c - 1.29
linux/drivers/net/ne2.c - 1.15
linux/drivers/net/hamradio/scc.c - 1.20
linux/drivers/isdn/isdn_tty.c - 1.15
linux/drivers/isdn/isdn_ppp.c - 1.17
linux/drivers/isdn/isdn_net.c - 1.22
linux/drivers/char/sysrq.c - 1.15
linux/drivers/char/serial.c - 1.45
linux/drivers/char/riscom8.c - 1.12
linux/drivers/char/nvram.c - 1.15
linux/drivers/block/floppy.c - 1.25
linux/arch/sparc64/mm/init.c - 1.27
linux/arch/sparc64/mm/extable.c - 1.4
linux/arch/sparc64/kernel/smp.c - 1.25
linux/arch/sparc64/kernel/ioctl32.c - 1.38
linux/arch/sparc64/defconfig - 1.43
linux/arch/sparc64/Makefile - 1.12
linux/arch/sparc/mm/fault.c - 1.16
linux/arch/sparc/mm/extable.c - 1.4
linux/arch/sparc/kernel/ebus.c - 1.11
linux/arch/sparc/Makefile - 1.10
linux/arch/i386/boot/setup.S - 1.22
linux/arch/i386/boot/Makefile - 1.11
linux/Makefile - 1.111
linux/MAINTAINERS - 1.67
linux/Documentation/video4linux/bttv/README - 1.14
linux/Documentation/pci.txt - 1.15
linux/drivers/isdn/hisax/cert.c - 1.6
linux/drivers/net/arlan.c - 1.19
linux/fs/partitions/check.c - 1.28
linux/drivers/isdn/hisax/hfc_pci.c - 1.18
linux/net/atm/common.c - 1.13
linux/drivers/block/DAC960.h - 1.9
linux/drivers/block/DAC960.c - 1.31
linux/drivers/net/pcmcia/3c589_cs.c - 1.18
linux/drivers/char/drm/vm.c - 1.8
linux/drivers/char/drm/proc.c - 1.9
linux/drivers/char/drm/memory.c - 1.7
linux/drivers/char/drm/lock.c - 1.7
linux/drivers/char/drm/lists.c - 1.7
linux/drivers/char/drm/ioctl.c - 1.7
linux/drivers/char/drm/init.c - 1.7
linux/drivers/char/drm/gamma_drv.h - 1.5
linux/drivers/char/drm/gamma_drv.c - 1.11
linux/drivers/char/drm/gamma_dma.c - 1.8
linux/drivers/char/drm/fops.c - 1.10
linux/drivers/char/drm/drmP.h - 1.12
linux/drivers/char/drm/drm.h - 1.8
linux/drivers/char/drm/drawable.c - 1.6
linux/drivers/char/drm/dma.c - 1.9
linux/drivers/char/drm/context.c - 1.7
linux/drivers/char/drm/bufs.c - 1.10
linux/drivers/char/drm/auth.c - 1.6
linux/drivers/char/drm/Makefile - 1.11
linux/drivers/net/tokenring/ibmtr.c - 1.17
linux/include/linux/pci_ids.h - 1.41
linux/drivers/net/pcmcia/3c574_cs.c - 1.16
linux/mm/highmem.c - 1.23
linux/drivers/net/sk98lin/skge.c - 1.15
linux/drivers/char/drm/tdfx_drv.h - 1.4
linux/drivers/char/drm/tdfx_drv.c - 1.9
linux/drivers/char/drm/tdfx_context.c - 1.5
linux/Documentation/video4linux/bttv/Sound-FAQ - 1.7
linux/Documentation/video4linux/bttv/CARDLIST - 1.11
linux/Documentation/video4linux/bttv/Insmod-options - 1.10
linux/drivers/usb/usbkbd.c - 1.17
linux/drivers/ieee1394/ieee1394_core.h - 1.7
linux/drivers/ieee1394/ieee1394_core.c - 1.12
linux/arch/i386/kernel/mpparse.c - 1.11
linux/drivers/char/mxser.c - 1.10
linux/drivers/net/tulip/tulip_core.c - 1.26
linux/drivers/ide/sis5513.c - 1.11
linux/net/ipv4/netfilter/ip_nat_proto_tcp.c - 1.3
linux/net/ipv4/netfilter/ip_conntrack_core.c - 1.10
linux/drivers/net/pcmcia/ibmtr_cs.c - 1.8
linux/include/linux/ibmtr.h - 1.5
linux/fs/partitions/ibm.c - 1.6
linux/include/asm-s390/cache.h - 1.4
linux/drivers/s390/block/dasd_eckd.c - 1.6
linux/drivers/s390/block/dasd.c - 1.9
linux/drivers/s390/Config.in - 1.8
linux/drivers/s390/block/Makefile - 1.5
linux/net/ipv6/netfilter/ip6_tables.c - 1.7
linux/net/ipv6/netfilter/Makefile - 1.7
linux/arch/i386/kernel/msr.c - 1.10
linux/drivers/char/drm/r128_drv.h - 1.6
linux/drivers/char/drm/r128_drv.c - 1.6
linux/drivers/char/drm/r128_drm.h - 1.4
linux/drivers/char/drm/r128_context.c - 1.4
linux/drivers/char/drm/r128_bufs.c - 1.6
linux/drivers/char/drm/mga_state.c - 1.6
linux/drivers/char/drm/mga_drv.h - 1.6
linux/drivers/char/drm/mga_drv.c - 1.6
linux/drivers/char/drm/mga_drm.h - 1.3
linux/drivers/char/drm/mga_dma.c - 1.5
linux/drivers/char/drm/mga_context.c - 1.4
linux/drivers/char/drm/mga_bufs.c - 1.6
linux/drivers/char/drm/i810_drv.h - 1.2
linux/drivers/char/drm/i810_drv.c - 1.5
linux/drivers/char/drm/i810_drm.h - 1.2
linux/drivers/char/drm/i810_dma.c - 1.8
linux/drivers/char/drm/i810_context.c - 1.3
linux/drivers/char/drm/i810_bufs.c - 1.4
linux/drivers/char/drm/ffb_drv.c - 1.8
linux/drivers/char/drm/ffb_context.c - 1.3
linux/drivers/char/drm/ctxbitmap.c - 1.2
linux/drivers/char/drm/agpsupport.c - 1.6
linux/drivers/usb/storage/usb.h - 1.9
linux/drivers/usb/storage/usb.c - 1.11
linux/drivers/usb/storage/transport.h - 1.7
linux/drivers/usb/storage/transport.c - 1.10
linux/drivers/usb/storage/scsiglue.c - 1.11
linux/drivers/char/drm/Config.in - 1.4
linux/drivers/char/sbc60xxwdt.c - 1.8
linux/drivers/usb/storage/protocol.h - 1.4
linux/drivers/usb/storage/protocol.c - 1.6
linux/drivers/usb/storage/debug.c - 1.6
linux/drivers/net/tun.c - 1.9
linux/net/ipv4/tcp_minisocks.c - 1.6
linux/drivers/usb/storage/shuttle_usbat.c - 1.6
linux/drivers/usb/storage/sddr09.c - 1.7
linux/drivers/usb/storage/freecom.c - 1.6
linux/drivers/usb/storage/dpcm.c - 1.3
linux/drivers/media/video/tuner.h - 1.5
linux/drivers/media/video/tuner.c - 1.6
linux/drivers/media/video/tda7432.c - 1.6
linux/drivers/media/video/msp3400.c - 1.7
linux/drivers/media/video/bttv.h - 1.9
linux/drivers/media/video/bttv-driver.c - 1.12
linux/drivers/media/video/bttv-cards.c - 1.8
linux/drivers/media/video/bt848.h - 1.3
linux/drivers/media/radio/Makefile - 1.8
linux/drivers/media/radio/Config.in - 1.7
linux/drivers/scsi/cpqfc.Readme - 1.3
linux/drivers/scsi/cpqfcTS.h - 1.3
linux/drivers/scsi/cpqfcTScontrol.c - 1.5
linux/drivers/scsi/cpqfcTSinit.c - 1.9
linux/drivers/scsi/cpqfcTSstructs.h - 1.3
linux/drivers/scsi/cpqfcTSworker.c - 1.5
linux/drivers/media/video/tvaudio.c - 1.6
linux/drivers/media/video/bttvp.h - 1.5
linux/mm/shmem.c - 1.10
linux/drivers/char/drm/r128_state.c - 1.2
linux/drivers/char/drm/r128_cce.c - 1.2
linux/drivers/char/drm/radeon_bufs.c - 1.5
linux/drivers/char/drm/radeon_context.c - 1.2
linux/drivers/char/drm/radeon_cp.c - 1.2
linux/drivers/char/drm/radeon_drm.h - 1.2
linux/drivers/char/drm/radeon_drv.c - 1.2
linux/drivers/char/drm/radeon_drv.h - 1.2
linux/drivers/char/drm/radeon_state.c - 1.2
linux/drivers/usb/storage/unusual_devs.h - 1.4
linux/include/asm-s390/dasd.h - 1.5
linux/include/asm-s390x/dasd.h - 1.6
linux/include/asm-s390x/cache.h - 1.4
linux/drivers/s390/block/dasd_fba.h - 1.3
linux/drivers/s390/block/dasd_fba.c - 1.5
linux/drivers/s390/block/dasd_eckd.h - 1.4
linux/drivers/s390/block/dasd_diag.h - 1.3
linux/drivers/s390/block/dasd_diag.c - 1.5
linux/drivers/s390/block/dasd_9343_erp.c - 1.3
linux/drivers/s390/block/dasd_9336_erp.c - 1.3
linux/drivers/s390/block/dasd_3990_erp.h - 1.4
linux/drivers/s390/block/dasd_3990_erp.c - 1.4
linux/drivers/s390/block/dasd_3370_erp.c - 1.3
linux/drivers/net/pci-skeleton.c - 1.7
linux/drivers/scsi/aic7xxx/aic7xxx.c - 1.4
linux/drivers/net/sungem.c - 1.5
linux/drivers/s390/block/dasd_9343_erp.h - 1.3
linux/include/asm-s390/vtoc.h - 1.3
linux/include/asm-s390x/vtoc.h - 1.3
linux/drivers/net/irda/irda-usb.c - 1.3
linux/drivers/media/video/bt856.c - 1.3
linux/drivers/media/video/bt819.c - 1.3
linux/drivers/media/video/adv7175.c - 1.3
linux/drivers/net/irda/ali-ircc.c - 1.3
linux/drivers/net/sk98lin/skproc.c - 1.5
linux/drivers/scsi/pcmcia/nsp_cs.c - 1.4
linux/drivers/scsi/pcmcia/nsp_cs.h - 1.4
linux/drivers/scsi/pcmcia/nsp_debug.c - 1.4
linux/drivers/scsi/pcmcia/nsp_io.h - 1.4
linux/drivers/video/aty/atyfb_base.c - 1.3