From: Steve Lord <lord@sgi.com>
Message-Id: <200106280527.f5S5Rt508838@jen.americas.sgi.com>
Date: Thu, 28 Jun 2001 00:27:55 -0500
Subject: TAKE - merge up to 2.4.6-pre6
Sender: owner-linux-xfs@oss.sgi.com
Precedence: bulk

One giant leap for Linux, one small step for XFS. In other words,
not a lot happened in filesystem land here.

There was a change in linux/drivers/net/Config.in which breaks xconfig,
I guessed at the fix based on a post on linux kernel, but I am pretty
sure it is not the correct change, I will fix it up once there is a
consensus.  Or more likely, Keith will fix it before I wake up in the
morning.

Steve

Date:  Wed Jun 27 22:21:16 PDT 2001
Workarea:  jen.americas.sgi.com:/src/lord/xfs-base

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


Modid:  2.4.x-xfs:slinx:97791a
linux/arch/sh/kernel/setup_sh2000.c - 1.1
linux/drivers/usb/se401.c - 1.1
linux/drivers/acorn/char/mouse_ps2.c - 1.1
linux/drivers/usb/se401.h - 1.1
linux/Documentation/usb/se401.txt - 1.1
linux/arch/sh/stboards/setup.c - 1.1
linux/arch/sh/stboards/pcidma.c - 1.1
linux/arch/sh/stboards/mach.c - 1.1
linux/arch/sh/stboards/led.c - 1.1
linux/arch/sh/stboards/irq.c - 1.1
linux/arch/sh/stboards/harp.h - 1.1
linux/arch/sh/stboards/Makefile - 1.1
linux/arch/arm/boot/compressed/head-integrator.S - 1.1
linux/drivers/usb/serial/cyberjack.c - 1.1
linux/drivers/usb/serial/pl2303.c - 1.1
linux/arch/sh/kernel/setup_bigsur.c - 1.1
linux/arch/sh/kernel/pci-sh7751.c - 1.1
linux/arch/sh/kernel/pci-dma.c - 1.1
linux/arch/sh/kernel/pci-dc.c - 1.1
linux/arch/sh/kernel/pci-bigsur.c - 1.1
linux/arch/sh/kernel/pci-7751se.c - 1.1
linux/arch/sh/kernel/mach_bigsur.c - 1.1
linux/arch/arm/mach-ebsa110/hardware.h - 1.1
linux/arch/sh/kernel/led_bigsur.c - 1.1
linux/include/asm-sh/bigsur.h - 1.1
linux/include/asm-sh/dc_sysasic.h - 1.1
linux/arch/sh/kernel/io_sh2000.c - 1.1
linux/include/asm-sh/io_bigsur.h - 1.1
linux/include/asm-sh/io_sh2000.h - 1.1
linux/arch/sh/kernel/io_bigsur.c - 1.1
linux/include/asm-sh/mc146818rtc.h - 1.1
linux/include/asm-sh/pci-sh7751.h - 1.1
linux/include/asm-sh/serial-bigsur.h - 1.1
linux/net/wanrouter/wanproc.c - 1.15
linux/net/wanrouter/wanmain.c - 1.11
linux/net/rose/rose_dev.c - 1.8
linux/net/netrom/nr_subr.c - 1.4
linux/net/netrom/nr_loopback.c - 1.7
linux/net/netrom/nr_dev.c - 1.8
linux/net/netlink/af_netlink.c - 1.14
linux/mm/vmscan.c - 1.59
linux/mm/page_alloc.c - 1.44
linux/kernel/sched.c - 1.36
linux/include/video/macmodes.h - 1.5
linux/include/linux/sockios.h - 1.6
linux/include/asm-arm/proc-armv/system.h - 1.11
linux/include/asm-arm/proc-armo/system.h - 1.9
linux/include/asm-arm/io.h - 1.15
linux/include/asm-arm/bitops.h - 1.6
linux/fs/select.c - 1.16
linux/fs/proc/generic.c - 1.20
linux/fs/proc/base.c - 1.25
linux/fs/nls/Config.in - 1.9
linux/drivers/video/mdacon.c - 1.9
linux/drivers/video/macmodes.c - 1.9
linux/drivers/video/imsttfb.c - 1.13
linux/drivers/usb/Makefile - 1.38
linux/drivers/usb/Config.in - 1.42
linux/drivers/sound/wf_midi.c - 1.9
linux/drivers/sound/wavfront.c - 1.16
linux/drivers/sound/sb_card.c - 1.25
linux/drivers/scsi/sym53c416.h - 1.5
linux/drivers/scsi/sym53c416.c - 1.9
linux/drivers/scsi/scsi_proc.c - 1.10
linux/drivers/scsi/hosts.c - 1.23
linux/drivers/scsi/eata_dma.c - 1.16
linux/drivers/scsi/aha152x.c - 1.19
linux/drivers/scsi/NCR53c406a.c - 1.10
linux/drivers/nubus/nubus.c - 1.7
linux/drivers/net/shaper.c - 1.18
linux/drivers/net/hamradio/soundmodem/sm_wss.c - 1.6
linux/drivers/net/hamradio/soundmodem/sm.h - 1.7
linux/drivers/net/hamradio/scc.c - 1.18
linux/drivers/net/hamradio/bpqether.c - 1.16
linux/drivers/net/ewrk3.c - 1.17
linux/drivers/net/am79c961a.c - 1.12
linux/drivers/net/Config.in - 1.40
linux/drivers/net/3c509.c - 1.22
linux/drivers/macintosh/macserial.h - 1.7
linux/drivers/macintosh/macserial.c - 1.17
linux/drivers/macintosh/mac_keyb.c - 1.14
linux/drivers/isdn/avmb1/capi.c - 1.22
linux/drivers/char/tty_io.c - 1.30
linux/drivers/char/nvram.c - 1.13
linux/drivers/char/esp.c - 1.10
linux/drivers/char/epca.c - 1.16
linux/drivers/char/cyclades.c - 1.17
linux/drivers/cdrom/mcdx.c - 1.8
linux/drivers/block/swim3.c - 1.12
linux/drivers/block/ps2esdi.c - 1.15
linux/drivers/block/paride/pt.c - 1.11
linux/drivers/acorn/scsi/acornscsi.h - 1.6
linux/drivers/acorn/scsi/acornscsi.c - 1.7
linux/drivers/acorn/net/ether3.c - 1.11
linux/drivers/acorn/net/ether1.c - 1.12
linux/drivers/acorn/char/mouse_rpc.c - 1.7
linux/drivers/acorn/char/keyb_ps2.c - 1.9
linux/arch/sparc64/defconfig - 1.38
linux/arch/sparc64/config.in - 1.40
linux/arch/i386/defconfig - 1.59
linux/arch/arm/mm/mm-armv.c - 1.22
linux/arch/arm/mm/fault-armv.c - 1.15
linux/arch/arm/kernel/traps.c - 1.19
linux/arch/arm/kernel/sys_arm.c - 1.17
linux/arch/arm/kernel/fiq.c - 1.10
linux/arch/arm/kernel/entry-armv.S - 1.19
linux/arch/arm/kernel/ecard.c - 1.13
linux/arch/arm/kernel/calls.S - 1.15
linux/arch/arm/boot/compressed/head.S - 1.13
linux/arch/arm/boot/compressed/Makefile - 1.18
linux/arch/arm/boot/Makefile - 1.8
linux/arch/arm/Makefile - 1.21
linux/arch/alpha/kernel/sys_alcor.c - 1.9
linux/Makefile - 1.92
linux/MAINTAINERS - 1.62
linux/Documentation/java.txt - 1.4
linux/Documentation/Configure.help - 1.85
linux/Documentation/Changes - 1.40
linux/CREDITS - 1.55
linux/net/decnet/af_decnet.c - 1.25
linux/drivers/video/cyber2000fb.c - 1.21
linux/drivers/sound/cmpci.c - 1.23
linux/drivers/acorn/char/keyb_arc.c - 1.9
linux/drivers/char/raw.c - 1.17
linux/drivers/char/sx.h - 1.4
linux/drivers/char/sx.c - 1.18
linux/drivers/isdn/avmb1/kcapi.c - 1.14
linux/drivers/net/sis900.c - 1.23
linux/drivers/atm/zatm.c - 1.10
linux/drivers/atm/uPD98402.c - 1.6
linux/drivers/atm/nicstar.c - 1.14
linux/drivers/atm/ambassador.c - 1.12
linux/net/atm/signaling.c - 1.7
linux/net/atm/mpc.c - 1.7
linux/net/atm/lec.c - 1.13
linux/net/atm/common.c - 1.11
linux/net/atm/clip.c - 1.11
linux/arch/sh/mm/init.c - 1.14
linux/arch/sh/mm/fault.c - 1.15
linux/arch/sh/kernel/time.c - 1.15
linux/arch/sh/kernel/sh_ksyms.c - 1.9
linux/arch/sh/kernel/setup.c - 1.15
linux/arch/sh/kernel/irq.c - 1.11
linux/arch/sh/kernel/entry.S - 1.18
linux/arch/sh/kernel/Makefile - 1.12
linux/arch/sh/config.in - 1.17
linux/drivers/char/n_r3964.c - 1.9
linux/include/asm-sh/user.h - 1.4
linux/include/asm-sh/string.h - 1.6
linux/include/asm-sh/softirq.h - 1.7
linux/include/asm-sh/semaphore.h - 1.5
linux/include/asm-sh/processor.h - 1.13
linux/include/asm-sh/pgtable.h - 1.18
linux/include/asm-sh/irq.h - 1.10
linux/include/asm-sh/io.h - 1.10
linux/include/asm-sh/hardirq.h - 1.7
linux/include/asm-sh/bugs.h - 1.8
linux/include/asm-sh/bitops.h - 1.7
linux/drivers/char/drm/proc.c - 1.8
linux/drivers/char/drm/dma.c - 1.8
linux/drivers/char/drm/context.c - 1.6
linux/drivers/net/dmfe.c - 1.16
linux/drivers/net/wan/cosa.c - 1.19
linux/drivers/net/wan/syncppp.c - 1.11
linux/drivers/net/wan/lapbether.c - 1.8
linux/arch/sh/mm/cache.c - 1.12
linux/include/asm-arm/pci.h - 1.11
linux/include/asm-sh/pgtable-2level.h - 1.6
linux/drivers/char/agp/agpgart_fe.c - 1.11
linux/drivers/telephony/ixj.c - 1.15
linux/Documentation/usb/usb-serial.txt - 1.16
linux/drivers/net/tokenring/smctr.c - 1.13
linux/drivers/scsi/3w-xxxx.h - 1.5
linux/drivers/scsi/3w-xxxx.c - 1.10
linux/drivers/usb/usb-uhci.c - 1.22
linux/drivers/usb/usb-ohci.c - 1.22
linux/drivers/atm/iphase.c - 1.9
linux/drivers/atm/idt77105.c - 1.4
linux/drivers/scsi/qla1280.c - 1.10
linux/arch/arm/mm/consistent.c - 1.9
linux/drivers/isdn/avmb1/c4.c - 1.14
linux/drivers/video/matrox/matroxfb_base.h - 1.6
linux/drivers/video/matrox/matroxfb_base.c - 1.10
linux/drivers/video/matrox/matroxfb_accel.c - 1.4
linux/drivers/video/matrox/matroxfb_Ti3026.c - 1.4
linux/drivers/video/matrox/matroxfb_DAC1064.c - 1.7
linux/drivers/char/nwflash.c - 1.7
linux/drivers/atm/fore200e.c - 1.11
linux/drivers/usb/pegasus.c - 1.19
linux/include/asm-sh/pgalloc.h - 1.4
linux/include/asm-sh/pci.h - 1.8
linux/drivers/net/appletalk/ipddp.c - 1.7
linux/drivers/char/sh-sci.h - 1.8
linux/drivers/char/sh-sci.c - 1.12
linux/arch/sh/kernel/pci-sh.c - 1.3
linux/drivers/usb/serial/Makefile - 1.14
linux/drivers/ide/sl82c105.c - 1.4
linux/drivers/ide/rapide.c - 1.5
linux/drivers/ide/ide-pci.c - 1.14
linux/drivers/ide/hpt366.c - 1.9
linux/drivers/net/wan/comx-proto-fr.c - 1.5
linux/drivers/net/wan/comx-hw-mixcom.c - 1.5
linux/drivers/scsi/dmx3191d.h - 1.3
linux/drivers/scsi/dmx3191d.c - 1.7
linux/drivers/net/wan/lmc/lmc_main.c - 1.7
linux/arch/sh/kernel/irq_ipr.c - 1.5
linux/drivers/char/drm/mga_state.c - 1.5
linux/drivers/char/drm/i810_dma.c - 1.6
linux/drivers/char/sbc60xxwdt.c - 1.6
linux/include/asm-sh/serial.h - 1.3
linux/arch/arm/boot/compressed/setup-sa1100.S - 1.6
linux/drivers/acpi/os.c - 1.6
linux/fs/jffs/inode-v23.c - 1.8
linux/arch/arm/mm/mm-l7200.c - 1.5
linux/drivers/mtd/Config.in - 1.5
linux/arch/sh/kernel/setup_od.c - 1.2
linux/include/asm-sh/machvec.h - 1.3
linux/include/asm-sh/io_od.h - 1.3
linux/drivers/sound/cs46xx.c - 1.11
linux/drivers/net/natsemi.c - 1.9
linux/drivers/media/video/zr36120.c - 1.6
linux/drivers/media/video/videodev.c - 1.5
linux/drivers/media/video/planb.h - 1.2
linux/drivers/media/video/planb.c - 1.6
linux/drivers/media/video/i2c-parport.c - 1.2
linux/drivers/isdn/eicon/linchr.c - 1.4
linux/drivers/isdn/eicon/common.c - 1.5
linux/drivers/char/i810-tco.c - 1.5
linux/arch/arm/tools/mach-types - 1.5
linux/arch/i386/kernel/bluesmoke.c - 1.8
linux/drivers/block/cciss.c - 1.9
linux/drivers/macintosh/mac_hid.c - 1.2
linux/drivers/net/sundance.c - 1.7
linux/drivers/net/winbond-840.c - 1.8
linux/drivers/usb/pegasus.h - 1.3
linux/include/asm-arm/xor.h - 1.4
linux/drivers/usb/serial/Config.in - 1.5
linux/drivers/video/matrox/matroxfb_g450.c - 1.2
linux/include/asm-sh/rtc.h - 1.2
linux/arch/sh/kernel/rtc.c - 1.4
linux/drivers/char/drm/radeon_bufs.c - 1.3
linux/drivers/sound/maestro3.c - 1.4
linux/drivers/sound/cs4281/cs4281m.c - 1.5
linux/arch/arm/tools/Makefile - 1.2
linux/arch/arm/tools/getconstants.c - 1.3
linux/drivers/sound/cs46xxpm-24.h - 1.2
linux/arch/sh/kernel/setup_dc.c - 1.3
linux/arch/sh/kernel/pci_st40.c - 1.2
linux/arch/sh/kernel/mach_dc.c - 1.3
linux/arch/sh/kernel/irq_intc2.c - 1.3
linux/arch/sh/kernel/io_hd64465.c - 1.2
linux/arch/sh/kernel/io_dc.c - 1.3
linux/arch/sh/kernel/hd64465_gpio.c - 1.3
linux/arch/arm/mach-ebsa110/arch.c - 1.2
linux/arch/arm/mach-ebsa110/io.c - 1.3
linux/include/asm-sh/hd64465_gpio.h - 1.3
linux/fs/freevxfs/vxfs_super.c - 1.2
linux/drivers/net/fealnx.c - 1.3
linux/fs/freevxfs/vxfs_lookup.c - 1.2
linux/fs/freevxfs/vxfs_inode.h - 1.2
linux/fs/freevxfs/vxfs_inode.c - 1.2
linux/fs/freevxfs/vxfs_fshead.h - 1.2
linux/fs/freevxfs/vxfs_bmap.c - 1.2
linux/include/linux/mii.h - 1.2