into flint.arm.linux.org.uk:/usr/src/bk/linux-2.6-serial

Thish fixes Suparna's fsx and aio-stress and Dave Olien's concurrent
mke2fs problems.

It moves the hash adding into as_add_request.  This fixes a small bug
where a request could be added to the merge hash after being put on the
dispatch list. 

It also moves responsibility for handling rbtree aliases (requests with
the same start sector) out of as_add_arq_rb and into its caller.  This
cleans up a layering problem which was causing the state machine to go
silly.  Now instead of forcing the alias out onto the dispatch list, we
chain the new request behind it, and they get sorted out at dispatch
time.

The PS/2 ESDI driver has some problems: a couple of typos on the modular
side and misuse of module_init():

On some PowerPC machines with a National Semiconductor Super I/O chip,
we have a divisor other than 1.625 Hz.  So when detecting a Super I/O,
don't change baud_base again.

A colleague reported that the keyboard of his brandnew laptop
is dead under 2.6 while 2.4 works.

Now I once wrote

  In order to avoid interference between scancode sequences
  or mouse packets and the reponses given to commands,
  the keyboard or mouse should always be disabled before
  giving a command that requires a response, and probably
  enabled afterwards. Some keyboards or mice do the disable
  automatically in this situation, but still require an
  explicit enable afterwards. 

(http://www.win.tue.nl/~aeb/linux/kbd/scancodes-9.html)

This is what happens on this laptop. The routine atkbd_probe()
probes for a keyboard, and after detecting it, enables it.
But immediately afterwards the routine atkbd_set_3() reads
the current scancode set and sets the desired set, and as a
side effect of these commands, the keyboard gets disabled again.

Thus, the keyboard enable must be moved after all command sending
has been done.

Now that I patch this area anyway: we are almost always in
scancode set 2 but send the ATKBD_CMD_SETALL_MB command
that only works in scancode set 3. At best this is useless.
At worst it confuses the keyboard. So, I put this command
in a separate routine and call that only when we really
are in scancode set 3.

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

Combine the two initialisation functions, allow SA1111 to be built
as a module, and remove a redundant SA1111 function prototype.

Patch from Holger Freyther

Make it work ;)

Patch from Holger Freyther

This fixes initialization of PCMCIA for the SIMpad



unsigned long now user for the flag

Patch from Holger Freyther

This the the resubmit of the flash partition changes for SIMpad.



Two versions one for cramfs one for all jffs2 and also the SIM has two banks instead of one even if they're next to each other...

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

into flint.arm.linux.org.uk:/usr/src/bk/linux-2.6-pcmcia

devfs_handle is not used any more.

My fault.  Fix for broken aarp.c which got an extra closing parenthesis.

<linux/interrupt.h> uses barrier() but does not include <linux/kernel.h>.

Whitespace cleanup (mostly deleting trailing whitespace).

This patch introduces a 1GB stack size limit for stack-grows-up (ie
PA-RISC), as discussed previously.

Dont print the contents of the initramfs, for any decent sized cpio it will
overflow the kernel ring buffer. 

Also relax permissions on /dev (755 not 700).

Set correct permissions on initramfs directories and special files. We dont
want to obey the umask here, so do the same thing we do on normal files -
call sys_chmod.

tty_register_driver already calls tty_register_device so there is no need
to do it in hvc_console. Besides, it oopses when we do that.

Thanks to Stephen Hemminger for pointing out how obsolete modules.txt is.

modules.txt contains mainly ancient information which is replicated
in the kconfig help message, README, makefile.txt or the modprobe manual
page.  The only part which is not covered elsewhere is the "building
external modules" which is still being debated (and belongs under the
kbuild docs).  kmod.txt reference removed from index, too.

pci_device_id can not be marked __devinitdata,
was re-added with last update by accident.

This fills in the ELF EI_OSABI field.  This doesn't matter for most
architectures, but PA-RISC uses the Linux flavour of the ABI (since HPUX
uses the None flavour).

Patch by Randolph Chung.

This is a lot better than what is there know.

From: Felipe W Damasio <felipewd@terra.com.br>

 - cli-sti removal
 - blk API update
 - set_current_state
 - Remove 'panic' line.

.. and we can now remove the BROKEN_ON_SMP Kconfig annotation.

From: Stephen Hemminger <shemminger@osdl.org>

Compiler warning due to missing equal sign.

From: Andrew Theurer <habanero@us.ibm.com>

This change:
http://linux.bkbits.net:8080/linux-2.5/diffs/kernel/sched.c@1.202

does not seem to make sense:

#define CAN_MIGRATE_TASK(p,rq,this_cpu)					\
	((!idle || (jiffies - (p)->last_run > cache_decay_ticks)) &&    \
		!task_running(rq, p) &&					\
			cpu_isset(this_cpu, (p)->cpus_allowed))

It should be just the opposite; an idle cpu should be able to have a more
aggressive steal, and a busy cpu should not.

From: Matt Mackall <mpm@selenic.com>

The new locking in the random driver is consuming 60% of CPU resources in
Anton's monster power5 boxes.


Basically, when the primary pool is 7/8th full, we shut off the firehose
and go into a trickle mode to keep the pool fresh.  Saves CPU for everyone
and should make the contention drop off the charts too (though the trickle
factor might need adjusting again for Origin-class machines).

From: Dave Hansen <haveblue@us.ibm.com>

I was compiling for my plain 'ol PC, and was getting unresolved symbols
for get_memcfg_from_srat() and get_zholes_size().  The CONFIG_NUMA
definition right now allows it to be turned on for plain old X86_PC. 
Does anyone know why this is? 

depends on SMP && HIGHMEM64G &&
          (X86_PC || X86_NUMAQ || X86_GENERICARCH ||
                  (X86_SUMMIT && ACPI && !ACPI_HT_ONLY))

In any case, the summit code incorrectly assumes in at least 2 places
that NUMA && !NUMAQ means summit.  Someone was evidently trying to cover
the generic subarch case, but that's already taken care of by the lovely
config system and CONFIG_ACPI_SRAT.  This patch fixes those assumptions
and adds a nice little warning for people that try to #include srat.h
without having srat support turned on.

From: Manfred Spraul <manfred@colorfullife.com>

The mwave driver uses a user space daemon for some modem operations. The
user space daemon calls ioctl(,IOCTL_MW_GET_IPC), and the driver returns
after an interrupt arrived. The actual wait used
interruptible_sleep_on(), which can lead to lost wakeups. A local 
spinlock on the stack is used to close that race, but this is broken on 
SMP, perhaps even with preempt.

The attached patch fixes that by switching to the normal 
add_wait_queue/test_if_race_occured/schedule/remove_wait_queue sequence.

ext3 has fancy test harness code which allows you to simulate crashes (for
testing recovery).  It will make the underlying disk start ignoring writes a
specified number of seconds after the mount.

It's inoperative without an additional offline patch anyway, and it's doing
hacky things which scared Al.  So kill it; I'll maintain it in the separate
ext3 debug patch.

From: Andre McCurdy <armcc2000@yahoo.com>

There is some inconsistency within lib/inflate.c and its users about
whether the error message text or the error() function should provide
the '\n'.

This patch tries to make everyone consistent - by removing the
newline from all message texts, and adding one to the only error()
function which did not provide it (in init/do_mounts_rd.c).

From: Andrey Borzenkov <arvidjaar@mail.ru>

LANG is not always enough to force date to english.

From: Rajesh Venkatasubramanian <vrajesh@eecs.umich.edu>

Don't deref the pte pointer after having kunmapped the memory it points at.

From: Rajesh Venkatasubramanian <vrajesh@eecs.umich.edu>

The remap_file_pages system call with MAP_NONBLOCK flag does not
install file-ptes when the required pages are not found in the
page cache. Modify the populate functions to install file-ptes
if the mapping is non-linear and the required pages are not found
in the page cache.

Patch is for test4-mm6. Compiles and boots. Patch tested using the
programs at:

http://www-personal.engin.umich.edu/~vrajesh/linux/remap-file-pages/

From: "Nakajima, Jun" <jun.nakajima@intel.com>

Attached is a patch that enables PNI (Prescott New Instructions)
monitor/mwait in the kernel idle handler.

From: Maneesh Soni <maneesh@in.ibm.com>

d_delete() calls dentry_iput() after releasing the per dentry lock.  This
can race with __d_lookup and lead to situation where we can make dentry
negative with ref count > 1.  The following patch makes dentry_iput() to
hold per dentry lock till d_inode is NULL and dentry has been removed from
d_alias list.

From: Christoph Hellwig <hch@infradead.org>

PPP leaves the chardev registered even if we're going to fail the modprobe.

From: john stultz <johnstul@us.ibm.com>

Don't try to support more than NR_CPUS cpus: things overflow.

Also, increase the default in config for some architectures.  (Dave
Hansen).

From: "Randy.Dunlap" <rddunlap@osdl.org>

remove duplicate #includes in kernel/