With help from Jeff Garzik and others.

This patch for 2.6 fixes the problem found by Zoltan Farkas
with mixed PCI/ISA and a non-modular config.  The problem is the old_netdev
ISA probing isn't skipping eth0 which already got assigned by the PCI
initialization.

At least one of them is critical. It fixes an path in the IOMMU that
I broke with the ealier "fullflush" workaround.

 - Check for ~/bin/installkernel like i386 (M. Bligh) 
 - Implement 32bit RTC_IRQ_SET correctly (Lutz Vieweg)
 - Disable some useless printks in 32bit emulation
 - Warning fixes for mixed C99 style declarations/statements.
 - Sync lAPIC power management with i386
 - Use topology sysfs like i386
 - Fix some serious bugs in the MCE handler. ECC should
   be decoded correctly now.
 - Add oops=panic option to panic on Oopses.
 - Fix hackish code in head.S
 - Add missing options in IOMMU
 - Fix _syscall6 (Olaf Hering)
 - Remove broken ACPI locking code. Port IA64 C version.
 - Make safe_smp_processor_id() more reliable
 - Read HPET in vsyscall code
 - Add workaround for BIOS that corrupt 64bit registers in HLT
 - Fix unaligned access in bitops.h
 - Remove broken ntp drift correction code for now
 - i386 merge in SCI setup
 - Fix wrong offset in callin.h (Jim Houston)
 - Minor comment fixes

into home.osdl.org:/home/torvalds/v2.5/linux

 - do not allocate firmware buffer if firmware is compiled into the
   driver.  Saves 220KB vmem (Andreas Oberritter)

 - Alter hotplug firmware naming to fit in with dvb standard.
 - Use the hotplug firmware loader for 2.6 kernels instead of compiling
   the firmware into the module. 
 - Integrate frontend into ttusb_dec module and remove pseudo-i2c bits,
   move ttusb_dec header into source file.
 - Rudimentary section filter support (enough for scan).

 - add Kconfig magic to select a firmware that can be compiled into the
   driver
 - add some hooks to av7110 to compile a firmware into the driver again

 - ves1820: increase mdelay from 30 to 50 to be more reliable with bad
   reception quality (Andreas Oberritter)
 - dst: remove AUTO_INVERSION for capabilities, allow params
   dst_type_flags and dst_type to have multiple values for multiple
   cards in one machine (Jamie Honan)

 - corrected handling of feed lists (Andres Oberritter)

 - add new documentation for getting bt8xx based DVB cards runnig
 - extend contributors list
 - change various email addresses in header files

Noted by Keith Owens.

	name-clash with declaration of routine of the same name in
	<linux/efi.h>.

into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5

	Patch from Stephane: Fix a bug in perfmon_default_smpl.c by
	which we would systematically lose one sample at every buffer
	overflow.

	are overly verbose and replace them with calls to sys_ni_syscall().

	(both for native and x86 system call tracing).  This is needed
	by recent versions of strace and UML likes to do that, too.

	cancel system-call restart.

Fix what seems to be a typo preventing .../power/state from working.

The x86 build depends on NR_VECTORS being defined. 

This symbol, however, was put only into mach-default/irq_vectors.h

The attached patch adds it to voyager too.

into home.osdl.org:/home/torvalds/v2.5/linux

into kernel.bkbits.net:/home/davem/tg3-2.6

into nuts.ninka.net:/disk1/davem/BK/net-2.6

      process.  The root-cause of the problem was that ptrace() tried
      to copy the portion of the register backing store that landed on
      the kernel stack back to users-space, but the resulting state
      was inconsistent if the inferior process was in the middle of a
      system-call (as would always be the case for strace).

      The solution is to avoid all needless copying and to instead
      ensure that when accessing a memory location that may belong to
      a thread's register-backing store, we attach to that particular
      thread, rather than the thread identified by the PID argument.
      If the thread happens to be unattachable, we fall back to using
      the thread identified by the PID argument.  This should have the
      desired effect if the thread has terminated already and if the
      thread is running while ptrace() is trying to access its state,
      all bets are off anyhow and there are no coherency guarantees.
      In other words, this should be doing the right thing under all
      circumstances.

      The patch also fixes the case where PT_AR_BSP and/or PT_CFM are
      written while the inferior process is in the middle of a system
      call.  This makes arguments passed to GDB inferior calls come
      out right.

      The patch was tested with strace -f and the GDB testsuite, which
      showed no regressions compared to the previous version of the
      kernel.

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

The old 50ms / 30ms timeouts apparently weren't sufficient
with some disks.

into nuts.ninka.net:/disk1/davem/BK/sparc-2.6

The reworked firmware loader in the DVB patches needs the fix to the
call_usermodehelper() return value. 

From: Rusty Russell <rusty@rustcorp.com.au>

MODULE_ALIAS_BLOCK() and MODULE_ALIAS_CHAR() define aliases of form
"XXX-<major>-<minor>", so we should probe for modules using this form.
Unfortunately in 2.4, block aliases were "XXX-<major>" and char aliases
were of both forms.

Ideally, all modules would now be using MODULE_ALIAS() macros to define
their aliases, and the old configuration files wouldn't matter as much. 
Unfortunately, this hasn't happened, so we make request_module() return the
exit status of modprobe, and then do fallback when probing for char and
block devices.

(Kudos to Chris Wright, I stole his kernel_thread flags).