into qualcomm.com:/home/kernel/tun-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux

From: 	James.Smart@Emulex.Com

This patch adds 5 more FC transport host attributes in support of HBAAPI. 
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: 	James.Smart@Emulex.Com

This patch deprecates the use of device_for_each_child() with stargets.
The reasoning behind this is due to issues regarding:
      Semaphores that device_for_each_child() takes
      Implicit assumptions that each child is an sdev device.

The patch adds a new helper function, starget_for_each_device(), and
replaces all previous uses of device_for_each_child().
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: Jesse Barnes <jbarnes@engr.sgi.com>

There are a few spots in qla1280.c that don't need a full PCI write flush
to the device, but rather a simple write ordering guarantee.  This patch
changes some of the PIO reads that cause write flushes into mmiowb calls
instead, which is a lighter weight way of ensuring ordering.
Signed-off-by: Jeremy Higdon <jeremy@sgi.com>
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: Adrian Bunk <bunk@stusta.de>

The patch below kills kernel 2.2 #ifdef's from the SCSI aic7xxx driver.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

This is really part of the earlier changeset from David to add the
new machine vector to support certain limited range DMA cards on
zx1.  I just forgot to run "bk new" before the commit, so the newly
added files weren't checked into BK.
Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

In ChangeSet 1.2370, 2005/01/11 17:41:32-08:00, tglx@linutronix.de wrote:
>
>         [PATCH] ppc: remove duplicate define
>        
>         The MMCR0_PMXE is already defined in reg.h...

Er, no it's not. But perhaps it should be...

Ingo presumably didn't notice that ppc64 already had a functional
_raw_read_trylock when he added the #define to use the generic
version.  This just removes the #define so we use the ppc64-specific
version again.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Currently we only print the default io scheduler if the kernel chooses,
not if the user/bootloader has specified one. This patch saves the extra
line in dmesg but always notified of the default choice by appending
(default) to that line:

	..
	io scheduler noop registered
	io scheduler anticipatory registered
	io scheduler deadline registered
	io scheduler cfq registered (default)
	..

Patch originally from Srihari Vijayaraghavan, modified by me.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Tony Luck <tony.luck@intel.com>

The accounting can go bad in the requeue hook, it must check the
accounted flag to make sure it was previously considered in the driver.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Keith Owens <kaos@sgi.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This apparently explains some weird IO failures reported in last two months.
Only non-bwx (including generic) kernels were affected.
Acked-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux

This enables it only for debug kernels, and also makes sure
that if some external module is still broken, we don't leave
the mmap-sem locked after warning about it.

It seems to be general consensus that its safer to require all do_brk() callers
to grab mmap_sem, and have do_brk to warn otherwise. This is what the following
patch does.

Similar version has been changed to in v2.4.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

We had all the locking right, but we didn't check whether one of the
threads now no longer needed to expand, so we could incorrectly _shrink_
the stack in the other thread instead (not only causing segfaults, but
since we didn't do a proper unmap, we'd possibly leak pages too).

So re-check the need for expand after getting the lock.

Noticed by Paul Starzetz.

Fix a long standing bug: numa=off only worked as last argument on
the command line.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix K8 node discovery after nodemask changes.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix fallout from the recent nodemask_t changes. The node ids assigned
in the SRAT parser were off by one.

I added a new first_unset_node() function to nodemask.h to allocate
IDs sanely.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

drivers/net/3c515.c: In function `__check_rx_copybreak':
drivers/net/3c515.c:406: warning: return discards qualifiers from pointer target type
drivers/net/3c515.c: At top level:
drivers/net/3c515.c:406: warning: initialization discards qualifiers from pointer target type
Signed-off-by: Andrew Morton <akpm@osdl.org>

Signed-off-by: Andrew Morton <akpm@osdl.org>

drivers/net/eepro.c:1799: initializer element is not constant
drivers/net/eepro.c:1799: (near initialization for `__param_arr_io.num')
drivers/net/eepro.c:1800: initializer element is not constant
drivers/net/eepro.c:1800: (near initialization for `__param_arr_irq.num')
drivers/net/eepro.c:1801: initializer element is not constant
drivers/net/eepro.c:1801: (near initialization for `__param_arr_mem.num')
Signed-off-by: Andrew Morton <akpm@osdl.org>

into pobox.com:/garz/repo/net-drivers-2.6

I found bugs on error handlings in the functions arround the ext3 file
system, which cause inadequate completions of synchronous write I/O
operations when disk I/O failures occur.  Both 2.4 and 2.6 have this
problem.

	I carried out following experiment:

1.  Mount a ext3 file system on a SCSI disk with ordered mode.
2.  Open a file on the file system with O_SYNC|O_RDWR|O_TRUNC|O_CREAT flag.
3.  Write 512 bytes data to the file by calling write() every 5 seconds, and
     examine return values from the syscall.
     from write().
4.  Disconnect the SCSI cable,  and examine messages from the kernel.

After the SCSI cable is disconnected, write() must fail.  But the result
was different: write() succeeded for a while even though messages of the
kernel notified SCSI I/O error.

By applying following modifications, the above problem was solved.
Signed-off-by: Hisashi Hifumi <hifumi.hisashi@lab.ntt.co.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Make PREEMPT_BKL depend on PREEMPT alone - doesnt make sense to enable it
on SMP && !PREEMPT kernels.  (other than testing.)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Manfred Spraul 

One bios assigns a small window for i/o access to yenta bridges.  But there
are Cardbus cards that needs lots of i/o ports.  yenta usually honors the bios
selected values, except if the bios choice is clearly invalid.  The patch
allows an override from the command line.
Signed-Off-By: Manfred Spraul <manfred@colorfullife.com>
Signed-Off-By: Dominik Brodowski <linux@brodo.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Also lock the ->exit() function in rsrc_nostatic
Signed-off-by: Dominik Brodowski <linux@brodo.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove the typedef'ing of struct resource_map.
Signed-off-by: Dominik Brodowski <linux@brodo.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Move the resource databases and the "mem_probe" flag into a struct
specific to rsrc_nonstatic, as it is not needed for the SS_CAP_STATIC_MAP
case. Saves a few bytes, and makes code clearer (in my opinion)
Signed-off-by: Dominik Brodowski <linux@brodo.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Make rsrc_nonstatic an independent module.
Signed-off-by: Dominik Brodowski <linux@brodo.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Move all the "nonstatic" code to a new file, and link it into pcmcia_core.ko
Signed-off-by: Dominik Brodowski <linux@brodo.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

re-direct calls to adjust_resource_info for MEM and IO.
Signed-off-by: Dominik Brodowski <linux@brodo.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Calls to adjust_mem_region only happen if !SS_CAP_STATIC_MAP.
Signed-off-by: Dominik Brodowski <linux@brodo.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>