into home.transmeta.com:/home/torvalds/v2.5/linux

Some socket hardware appears to "bounce" when a card is inserted - we
seem to receive more than one SS_DETECT event.  Unfortunately, this
causes us to initialise, setup the socket, and create the necessary
devices multiple times.

Fix this by ignoring card insertion events when we already know that
there is a card in the socket.

Don't remove sillyrenamed files: those will be removed (by
nfs_async_unlink) when they are no longer used any more.

Remove double initialization of "i_mode" in __nfs_fhget().

DM originally stored a devfs handle in the hash-cell, and performed the
unregister based on that handle. These devfs handles have since been removed,
and devices are registered and unregistered simply based on their names. So
the device now needs to be unregistered before we lose the name.

See the following BK change for more details:
http://linux.bkbits.net:8080/linux-2.5/diffs/drivers/md/dm-ioctl.c@1.6?nav=index.html|src/|src/drivers|src/drivers/md|hist/drivers/md/dm-ioctl.c
[Kevin Corry]

We must always allocate windows below 1MB when a socket driver
indicates that it does not have "page registers".  Handle this
case in rsrc_mgr.c within find_mem_region rather than each use
of find_mem_region().

Remove the racy check_mem_resource() function.  Instead, claim
the region while we check it, passing a resource structure to
the core validation functions.

The overwhelming majority of Linux users are using modular PCMCIA,
and loading the "yenta_socket" module.  2.5.71 unfortunately changed
the name to "yenta" when pci_socket.c was combined with yenta.c.
Rename yenta.[ch] to yenta_socket.[ch] for compatibility.

into home.transmeta.com:/home/torvalds/v2.5/linux

into home.transmeta.com:/home/torvalds/v2.5/linux

into home.transmeta.com:/home/torvalds/v2.5/linux

Propagate do_settimeofday() change into osf_settimeofday().

Ivan.

into kanga.twiddle.net:/home/rth/work/linux/axp-2.5

- 2.4 resync
  - incorrect size usage in pci_unmap_single();
  - s/ETH_P_IP/hdlc_type_trans()/
- inccorect debug message in dscc4_clock_setting();
- split of TO_STATE() into TO_STATE_{RX/TX} for documentation purpose.

into kernel.bkbits.net:/home/davem/net-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5

into kernel.bkbits.net:/home/davem/sparc-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5

Lots of small fixes and I merged the PCI subsystem with i386 again
because it was mostly identical. This makes the patch quite big,
but it only removes files.

 - Merge PCI subsystem with i386.

   This changes the initialization order of PCI and IOMMU slightly.  It
   didn't see any problems yet, but it could cause some in theory.  It
   re-adds some code that used to be removed, but it's only small stuff
   and it should hopefully cause less mainteance overhead longer term.

 - Fix warnings
 - Merge cpuid.c with i386.c
 - Sync msr.c with i386
 - Consolidate externs in asm/proto.h
 - sysfs/sysdev fixes for apic/nmi (Bryan O'Sullivan)
 - Fix /proc/kcore access
 - Add real kern_addr_valid (used for above).
 - Support consistent dma_mask in IOMMU
 - Fix double print of AMD for CPU model.
 - Remove unused wakeup.S file.
 - Remove obsolete CONFIG_SIMNOW ifdef.
 - Support ptrace access for 32bit vsyscalls.
 - Fix warnings in 32bit boot code compilation.

Handle both unsigned int and unsigned long in rtc_read. This helps
when running 32bit userland under an 64bit kernel.

into nuts.ninka.net:/home/davem/src/BK/net-2.5

1) More reasonable ip_rt_gc_min_interval default
2) Trim less valuable entries in hash chain during
   rt_intern_hash when such chains grow too long.

into nuts.ninka.net:/home/davem/src/BK/net-2.5

1) We export __check_region, so making it __deprecated gives a spurious
   warning in kernel/ksyms.c.
2) Other warnings refer to __check_region rather than check_region,
   which has confused some people.

Make check_region an inline, not a macro, and deprecate *that*.

A number of small ColdFire serial driver fixups:
 - use correct irq handler return type (irqreturn_t)
 - add support for mark and space parity
 - some casting to keep types clean (and remove compile warnings)
 - fix missing ";" after local tty_driver struct definition

We no longer use sub-architecture speicific interrupt setups
in the m68knommu branch. Remove obsolete call to 68328 irq
init.

Make the ROMfs copy in the startup code for Motorola/M5206eLITE board
conditional on actually using a ROMfs setup.

Minor board name change in m68knommu setup,
"Dragon Engine" -> "DragonEngine".

The NCP ioctls are declared unconditionally in compat_ioctl now, which needs this
include to still compile on x86-64.

The us->ns conversion must be in the "tv" if branch of settimeofday,
not in the "tz" if.

Also make it compile for x86-64 again. The 32bit emulation was forgotten
in the conversion.

Although no such oops has been reported, removing a socket driver
while a file under /sysfs/class/pcmcia_socket/pcmcia_socket* is
held open by user space could potentially cause an oops.

Plug this by preventing pcmcia_unregister_socket from returning
until all references by sysfs to the pcmcia socket have been dropped.