If the driver doesn't update the peroid, we go
around forever.  The fix is to keep our old period
unless the driver returns a greater one.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Eliminate unused function wd7000_abort() in wd7000 driver.

  CC [M]  drivers/scsi/wd7000.o
drivers/scsi/wd7000.c:1612: warning: `wd7000_abort' defined but not used

As the author states in his comment, this is "unfinished business" ;-)


From: Mika Kukkonen <mika@osdl.org>
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

On Mon, Jun 14, 2004 at 08:22:15PM +0100, Christoph Hellwig wrote:
> On Mon, Jun 14, 2004 at 08:52:56PM +0200, Adrian Bunk wrote:
> > The issue described in the mail forwarded below is still present in
> > 2.6.7-rc3-mm2 (but not specific to -mm).
> >
> > I'd suggest the following workaround:
>
> Please add the exports instead.  It'll affect all the other 53C9X-based
> drivers aswell.

This sounds like a better solution.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: "Robert T. Johnson" <rtjohnso@eecs.berkeley.edu>

Since arg is a user pointer, so are uioc_mimd and uiocp, and hence umc is a
user pointer.  Thus reading umc->xferaddr requires dereferencing a user
pointer, which isn't safe.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

> Although, I think, there's still a glitch there (modified if's order).
> I'll send a new version, if the approach is approved in principle.

Ok, attached is version 3:-) It also fixes a definite (although, perhaps,
harmless) bug in scsiiom.c. And removes a redundant assignment in
tmscsim.c.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

 - qlogicfc.c abuses SCSI_TIEMOUT although it's not part of the scsi
   core, give it it's own ISP_TIMEOUT define
 - avoid redefining timeouts #ifdef DEBUG, that's a cause for heisenbugs
   just waiting to happen
 - now SCSI_TIMEOUT is private to scsi_scan.c, move it there
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Add proper __user annotation to selinux_shm_shmat.

From: Mika Kukkonen <mika@osdl.org>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add proper __user annotation to dummy_shm_shmat.
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add proper __user annotation for shm_shmat hook in security.h.

From: Mika Kukkonen <mika@osdl.org>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Some filesystems can get overflows when their link-count exceeds
65534.  This patch increases the kernels internal resolution for this
and also has a check for the old-system call paths to return and error
(-EOVERFLOW) as required (as suggested by Al Viro).
Signed-off-by: Chris Wedgwood <cw@f00f.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch results in too much idle time under certain
loads, and while that is being looked into we're better
off just reverting the change.

Cset exclude: nickpiggin@yahoo.com.au[torvalds]|ChangeSet|20040605175839|02419

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

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

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

This patch fixes orphaned expectations, which can occur when helpers create
expectations for unconfirmed conntracks and the packet is dropped before
the conntrack is confirmed.
Signed-off-by: Phil Oester <kernel@linuxace.com>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@redhat.com>

Tracked down by Raivis Bucis <raivis@mt.lv>

This patch fixes an oops while listing /proc/net/ip_conntrack.

When a helper sets up expectations based on the first packet (tftp),
NAT can still change the packet and cause conntrack to look for a new helper
based on the new tuple. When no helper is found, expectant->helper will be
NULL, which leads to an oops in print_expect().
 
Only assign a new helper in ip_conntrack_alter_reply() if there are no
expectations.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@redhat.com>

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@redhat.com>

[IPV6] IPSEC: fix double kfree_skb() in error path. (reported by Ken-ichirou MATSUZAWA <chamas@h4.dion.ne.jp>)
Signed-off-by: Yoshifuji Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@redhat.com>

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

This fixes build errors in EBSA110, and updates the default
configuration.

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

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

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Patch fixes out_be64 implementation on ppc64 along with a glich in out_be32
(inconsistent) use of barrier.
Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>

Nick changed shrink_cache() to void, but one call was missed.

From: Mika Kukkonen <mika@osdl.org>
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Nick Piggin <nickpiggin@yahoo.com.au>

nfs_writepage() refuses to write back mapped pages at all on the page
reclaim path, causing systems to get locked up when there's a lot of dirty
mmapped data around.  The patch changes NFS so that it will start I/O
against these pages.

The code as it stands is designed to defer writeout to pdflush which can do
larger, more efficient I/Os.  But there shouldn't be much traffic by this
path, and going slow is better than not going at all.

Patch originally from Trond.
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

VIA chipsets are broken and don't work with IOMMU enabled. For some mysterious
reason (the IOMMU logic is actually in the CPU) they manage to corrupt all
data going through the aperture to PCI devices.

There was a workaround previously that enabled the slower softmmu when VIA is 
detected on the normal IOMMU path (when there is more than 3GB of memory). But
CONFIG_IOMMU_DEBUG took a short cut that was not handled, which ended up with 
VIA systems not booting when this option is enabled.

This patch enables the workaround with CONFIG_IOMMU_DEBUG/iommu=force too

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

into delerium.codemonkey.org.uk:/mnt/data/src/bk/cpufreq

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

Signed-off-by: Ben Collins <bcollins@debian.org>

Signed-off-by: Ben Collins <bcollins@debian.org>

Signed-off-by: Ben Collins <bcollins@debian.org>

Submitted-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Ben Collins <bcollins@debian.org>

Submitted-by: Hiromasa YOSHIMOTO <yosimoto@limu.is.kyushu-u.ac.jp>
Signed-off-by: Ben Collins <bcollins@debian.org>

  - Use vmalloc instead of kmalloc
  - Change delayed_reset_bus() to operate in a work_queue instead of a timer
    interrupt.
  - Fix hpsb_allocate_and_register_addrspace() to not allocate space on top
    of already allocated space.
  - Fix problems in csr1212.c filling ConfigROM images when extend ROMs are
    present.
Signed-off-by: Steve Kinneberg <kberg@linux1394.org>
Signed-off-by: Ben Collins <bcollins@debian.org>

into nuts.davemloft.net:/disk1/BK/sparc-2.6

This adds the definition for Apple XServe G5 motherboard to the
pmac_feature support file.

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