into samba.org:/scratch/anton/sfr

into samba.org:/scratch/anton/sfr

into samba.org:/scratch/anton/sfr

into samba.org:/scratch/anton/sfr

into samba.org:/scratch/anton/sfr

This includes the following items:

 - a new wakeup feature: SMART_WAKE_CHILD (now unconditional) [this is a
   reworked version of the wakeup changes from Andrea's tree.]

 - scheduler parameter tunings (CHILD_PENALTY, MAX_TIMESLICE,
   STARVATION_LIMIT, MAX_SLEEP_AVG)

 - activate_task() splitup to separate the interactivity-active variant
   from the task-queue variant => this fixes our statistics in some cases.

 - finer-grained preemption: if priority is equal then the task with the
   longer pending timeslice wins.

 - make it possible to disable sync-wakeups via SYNC_WAKEUPS (default:1)

 - a naming cleanup (sleep_timestamp => last_run)

 - fix up STARVATION_LIMIT usage so that a value of 0 is recognized as 'no
   starvation limit'.

It also merges Linus' "priority boost backmerging"

that is actually showing interactive behaviour (sleeping) and the
process that wakes up the interative process get a bonus.

This means that processes that help interactive processes (usually
system daemons, and X11 in particular) will themselves get some bonus.

The waker only gets whatever is left over from the "real" interactive
user, to avoid any bad behaviour.

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

pcibios_claim_console_setup() doesn't look behind PCI-PCI bridges.

Noticed by Anton Blanchard.

Ivan.

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

into samba.org:/scratch/anton/sfr

(While "signed long" is the same in practice, it is technically
incorrect, and the new anal type-checker complains).

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

Use ->dev instead of ->intf.dev in struct cpufreq_policy. Introduced whilst
cleaning up part of the cpufreq code. 

During startup, sysfs won't succeed in registering with itself, because
it's not yet inititialized. This was causing an unnecessary error on boot.

- Make it compare the name in struct platform_dev to the driver's name.

From Dominik Brodowski

Credits also to Mitsuru Kanda <kanda@karaba.org>,
YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>,
and Kunihiro Ishiguro.

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

The below has been in -mm for a while, and has been tested on my UP
and 2-way machines.

OProfile was completely unsafe on UP - a spinlock is no protection
against the NMI arriving and putting data into the buffer. Pretty stupid
bug. This fixes it by implementing reader/writer windows in the buffer
and removing the lock altogether. This patch was originally done by Will
Cohen.

It also fixes the oops Dave Hansen saw on 2.5.62 SMP

into samba.org:/scratch/anton/sfr

I had my list empty checks reversed if aborting and bus device reset
failed.  The condition that causes the error handler to run is still
unknown.

Now that the agpgart support is in, this can be enabled.

/jeff

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

Many places use inappropriate types for comparing jiffies,
int for example.  Fix those places up.

into samba.org:/scratch/anton/sfr

 - Cleanup Makefile.
 - Fix potentional crash in dv1394 module unload.
 - Why does ARM's memcpy not return void*? Oh well, work around it in
  eth1394 by not expecting standard behavior.