into jen.americas.sgi.com:/src/lord/bitkeeper/xfs-2.5

into kernel.bkbits.net:/home/lord/xfs-2.5

also detach the threads.

Otherwise we'll leave them around as zombies, waiting for them
to be picked up by their parent. Which might be the execve()
thread itself, causing a deadlock.

Noted by Sean Estabrooks:

There is a bug in "ll_rw_blk.c" handling partial bvec submissions.
For whatever reason the floppy driver was triggering it more than
other users (most likely because most other devices tend to be able
to always complete a full request in one go).

Fixed by updating the proper bio vector index entry.

Add kconfig options to allow excluding either or both the I/O
schedulers.  This can be useful for embedded systems (saves about ~13KB).

All schedulers are enabled by default for non-embedded.

into laptop.americas.sgi.com:/home/lord/src/xfs-2.5

SGI Modid: 2.5.x-xfs:slinx:153273a

This updates the valkyriefb driver to the new API.

From Paul Mackerras <paulus@samba.org>:

 "It compiles OK, but I haven't been able to test it.  I have simplified
  the driver quite a bit using the knowledge that there can only ever be
  one valkyrie graphics adaptor in a system - it is the built-in
  graphics adaptor on various ancient mac and powermac machines, and we
  access it at a hard-coded address, so we can only handle one."

into laptop.americas.sgi.com:/home/lord/src/xfs-2.5

Documentation/nmi-watchdoc.txt doesn't actually tell what options need to be
enabled in kernel config in order to use NMI watchdog. I for one found it
confusing.

Rename ariadne2 to zorro8390, since this driver supports several NS8390-based
Zorro Ethernet cards. Kill all never used occurrencies of CONFIG_NE2K_ZORRO.

m68k cache updates (from Roman Zippel):
  - Uninline flush_icache_range()
  - Add virt_to_phys_slow() which handles vmalloc()ed space

M68k: Use genrtc on all m68k platforms

M68k: Allow ALLOWINT to be used with other types than short (fixes a problem
with irqs_disabled(), from Roman Zippel)

dmasound: Implement missing SOUND_PCM_READ_RATE ioctl (from Richard Zidlicky)

MIPS: Show the correct logo on DEC and SGI machines.

M68k FPU emulator: Add fgetman, fgetexp and fsqrt (from Michael Müller and
Roman Zippel)

M68k: A few missing updates to the new irq API:
  - Q40/Q60 keyboard
  - Q40/Q60 floppy
  - Sun-3x floppy

m68k page updates (from Roman Zippel):
  - Set _PAGE_RONLY bit and clear _PAGE_PRESENT to mark PAGE_NONE pte entries
    (this also makes PAGE_NONE fixup unnecessary)
  - Move _PAGE_FILE to a lower, so pte_to_pgoff/pgoff_to_pte becomes simpler

NCR53C9x: Remove unused initialization of SCp.have_data_in (from Maciej W.
Rozycki). This affects the following drivers:
  - DECstation SCSI
  - Amiga Oktagon SCSI

Macfb compile fixes

M68k: Add missing include for IPV6

M68k: Update for changed do_fork() semantics in 2.5.70

M68k: Fix SCSI breakage introduced in 2.5.74 by not including
<asm-generic/dma-mapping.h>, unless PCI is available.

M68k: show_stack() portability and cleanup patch:
  - Add a task pointer argument to show_stack() and pass NULL as the first
    argument where needed
  - Remove show_trace_task()

Sun-3 SCSI: Kill a warning about a nonmatching prototype after recent SCSI
proc_info() changes.

lmc_proto.c includes <asm/smp.h>, causing build failures on UMP-only
architectures

Atari ksyms: Kill obsolete symbol exports

M68k: Kill superfluous includes

Sun-3: pte_file fixes for sun-3 MMUs (from Sam Creasey)

Apollo: Kill initialization of obsolete mach_floppy_init and unnecessary
mach_floppy_setup function pointers

Mac8390: Fix typo (from Etsushi Kato)

Update my GnuPG fingerprint and address information

M68k: Kill erroneous `inline' (found by gcc 3.2)

Mac/m68k sonic: Kill warning and remainings of 2.2-style flow control

Resurrect dmasound: Re-re-add dmasound to the build process (it got removed
again in 2.5.71)

Atari ST-RAM: Add missing include

ADB HID: Exclude PowerMac-specific things on classic Macs

Atari pamsnet: Fix typo