From Jeff.Wiedemeier@hp.com.

(Titan / Marvel), Kconfig and headers.

From Jeff Wiedemeier.

From Jeff.Wiedemeier@hp.com:

Add platform-specific callin for SMP.

From Jeff.Wiedemeier@hp.com:

- Only create smp_affinity /proc nodes if a set_affinity handler
  is provided.
- Limit the number of irq nodes that will be created in /proc
  to avoid overfilling the /proc inode space.

a titan specific kernel.

From Jeff.Wiedemeier@hp.com:

Update titan system support include AlphaServer DS25, AGP,
enhanced machine check handling.

From Jeff.Wiedemeier@hp.com:

Add arch/alpha/mm/remap.c (__alpha_remap_area_pages).

Until now, we were configuring all PCI resources from scratch.
This patch allows to use unchanged PCI setup on platforms
where the firmware does it reasonably well (titan and marvel).

[The patch to setup-bus.c that removes "FIXME" from here (ie makes
pci_assign_unassigned_resources to match its name) exists at least
for two months, but I've yet to convince Linus that it does the
right thing...]

Ivan.

  Move ALSA before OSS

  The input system in 2.5 is able to see the volume keys on inspiron
  notebooks w/o help from i8k.c.  This patch therefore removes the
  new code from i8kutils-1.17 for feeding those keypresses to the
  keyboard driver.

  This leaves only MODULE_PARM(restricted, "i") as the useful addition
  to what was in 2.5.58's i8k.c.  This module parm restricts control of
  the system fans to processes with CAP_SYS_ADMIN set.

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

There's no need to alias the kallsyms-related symbols to a dummy
variable, we can as well just do the sanity check against NULL.

  Allow for different LMA vs VMA (logical/virtual memory address).
  IA-64 uses the LMA to tell the bootloader the physical location
  of the image, whereas the VMA as always represents the address the
  image gets mapped to.
  
  The default (used for non IA-64) is LMA == VMA, which is what
  the linker previously assumed anyway.
  
Also:
o remove duplicate .rodata1 section
o __vermagic doesn't need its own section in vmlinux, it can
  just go into .rodata
o .kstrtab hasn't been used since the introduction of the new
  module loader, so it should be deleted from the linker scripts
  as well (except for arch/um, which does not seem up to date
  w.r.t the new module loader yet)
o The kallsyms mechanism has changed to not need its own section,
  so again the references in the linker scripts can go away

The current code reserves 60 bytes for the symbol string of every
exported symbol, unnecessarily wasting kernel memory since most symbols
are much shorter. We revert to the 2.4 solution where the actual strings
are saved out of line and only the pointers are kept.

The latest module-init-tools already handle this case, people who are
using older versions need to update to make sure depmod works
properly.

Saves 80 KB in vmlinux with my .config.

From: James Bottomley <James.Bottomley@steeleye.com>
  
kallsyms is broken in parisc on 2.5.56 again because of assembler syntax
subtleties.  This is the offending line:
  
printf("\t.byte 0x%02x ; .asciz\t\"%s\"\n"
  
Note the `;' separating the two statements.  On some platforms `;' is a
comment in assembly code, and thus the following .asciz is ignored.

Mac/m68k NCR5380 SCSI updates (forward port of Ray Knight's changes in 2.4.x):
  - Forward port of pseudo-DMA from 2.2.20
  - Move SCSI host template definition from mac_scsi.h to mac_scsi.c

Generic RTC driver: fix spelling in documentation (from Geoffrey Lee
<glee@gnupilgrims.org>)

Q40/Q60 keyboard fixes:
  - IRQ definitions were prepended with Q40_
  - <asm/keyboard.h> no longer exists
  - Let q40kbd_init() fails if not running on a Q40/Q60
  - q40kbd_init() must return an error code
  - Make q40kbd_{init,exit}() static

Jeff removed the swap_device member from struct swap_info_struct
(http://www.uwsg.iu.edu/hypermail/linux/kernel/0202.1/0258.html)
but it is still used in the m68k arch for the ST-RAM. The below
should remove it.

Frankly, I didn't try compiling... My original intent was to move the
swap_list definition from swap.h to mm/swapfile.c, but m68k still
uses it here :( so perhaps this isn't possible. And I just happened to
stumble upon this.

(from Marcus Alanen <maalanen@ra.abo.fi> through Rusty Trivial Russell)

M68k generic RTC driver updates:
  - Revive help text for CONFIG_GEN_RTC
  - Re-add lost config option for CONFIG_GEN_RTC_X
  - Re-add lost mach_get_ss()
  - Export mach_[gs]et_rtc_pll()
  - Add implementation of mach_get_ss() and mach_[gs]et_rtc_pll() for Q40/Q60
  - Add missing include
  - Add implementation of get_rtc_ss()

Sun-3: Add missing deactivate_mm() (yes, there should be two of them in
include/asm-m68k/mmu_context.h: one for Motorola MMUs and one for Sun-3 MMUs)

M68k exception table updates to compensate for changes in 2.5.55

Q40/Q60 IRQ updates from 2.4.x

Amiga keyboard: the release bit indicates a key release, not a key press.

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

vm_enough_memory seems to call si_meminfo just to get the total
RAM, which seems far too expensive. This replaces the comment
saying "this is crap" with some code that's less crap.

Here is the s390x patch to use the new generic compatibility functions.

This creates compat_sys_sigpending and compat_sys_sigprocmask and
patches sent to maintainers remove all the arch specific versions.

With Martin's continuing approval, here is the s390x part of the patch.

This creates compat_sigset_t and compat_old_sigset_t i.e.  just the
types.  This is just the generic part, the architecture specific parts
will be sent to respective maintainers.

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

into samba.org:/scratch/anton/for-alan

into samba.org:/scratch/anton/for-alan

into samba.org:/scratch/anton/for-alan

into samba.org:/scratch/anton/for-alan