There were several receive ring related bugs.

In velocity_give_many_rx_descs(), index calculation was incorrect.
This and bugs in velocity_rx_srv() described in the following paragraph
caused packet loss, truncation and infinite error interrupt generation.

In velocity_rx_srv(), velocity_rx_refill() could be called without any
dirty slot.  With proper timing, This can result in refilling yet
unreceived packets and pushing dirty pointer ahead of the current pointer.
And vptr->rd_curr which is used by velocity_rx_refill() was updated after
calling velocity_rx_refill() thus screwing receive descriptor ring.
Also, between checking owner and reading the packet, rmb() is missing.
Signed-off-by: Tejun Heo <tj@home-tj.org>

In velocity_give_rx_desc(), there should be a wmb() between resetting the
first four bytes of rdesc0 and setting owner. As resetting the first four
bytes isn't necessary, I just removed the function and directly set owner.
Another rationale for removing the function:
The function doesn't handle synchronization. We should do wmb() before
calling the function.  So, I think using bare assignment makes the fact
more explicit.
Signed-off-by: Tejun Heo <tj@home-tj.org>

Removed unused velocity_info.xmit_lock.
Signed-off-by: Tejun Heo <tj@home-tj.org>

velocity_nics wasn't managed properly.
Signed-off-by: Tejun Heo <tj@home-tj.org>

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

It fixes an oops that results when a lobe fault is detected.  The oops
occurs because a lobe fault triggers an interrupt which is handled
in the current version of the driver by effectively shutting down the
card, and freeing its requisite irq.  The former is fine, the latter
is not, as its illegal to free an irq from within an interrupt context.

I've fixed this bug by removing the call to free_irq from the interrupt
handler (specifically the chunk around line 964 fixes that).  While I
was in there I noticed that there were several other conditions in
the interrupt handler that contained the same condition, so I made
the same fix there.  I re-added.

I also modified the contents of olympic_freemem (the chunk around line
898 to correct a misuse of a pointer after it requisite memory has
been free in the case the the adapter is re-initalized after a fault
to prevent that oops.  And then I clean up the interrupt handler to
simply use olympic_freemem from the close routine since the ring buffer
doesn't need to be freed until the driver is closed.

In addition to these changes I added a call to olympic init in
olympic_open and reset the spinlock so the adapter can be reset and
rejoin the ring without needing to rmmod/insmod the module.  Lastly I
cleaned up the wait queue code so that the close routine didn't have
to wait 60 seconds to close the adapter if a fatal fault has closed
the adapter.
Signed-off-by: Neil Horman <nhorman@redhat.com>

Al suggested a sparse warning. And sure enough, it found
these ones.

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

The attached patch makes s390 sclp driver buildable again.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Patch from Ben Dooks

Add definitions to the MISCCR register for configuration
of the signal states in power down mode.

Signed-off-by: Ben Dooks 

Patch from Ben Dooks

Include file include/asm-arm/arch-s3c2410/regs-iic.h,
for the I2C controller on the S3C2410 Samsung SoC.

Signed-off-by: Ben Dooks

Patch from Ben Dooks

Header file include/asm-arm/arch-s3c2410/regs-mem.h containing
definitions for the S3C2410 memory controller

Signed-off-by: Ben Dooks 

Patch from Dave Jiang

Latest IQ80331 redboot changed value of ATU registers and is causing master aborts on the plugged in card. Changing value back to previous sane state for Linux.

Signed-off-by: Dave Jiang (dave.jiang@gmail.com)

Patch in replacement of 2099/1 due to formatting problems.

Some compilers seem to get "%?" wrong in macros.

We really need to check that we have access to the whole of the
signal frame when we allocate it, rather than "most of it" when
we have iWMMXt extensions selected.

- Use ISA_DMA_THRESHOLD as the mask for GFP_DMA allocations.
- Don't allow DMA allocations which are for a "smaller" mask than
  ISA_DMA_THRESHOLD.
- Ensure that "handle" is initialised to our error value when
  returning an error.

Add locking for use of kecardd services.
Use wait_event_interruptible() rather htan interruptible_sleep_on().

Patch from Ben Dooks

Fix missing changelog entries in <asm-arm/arch-s3c2410/hardware.h>,
and erroneous EINT definitions in <asm-arm/arch-s3c2410/regs-gpio.h>.

Added s3c2410_gpio_getcfg(pin) and s3c2410_gpio_getirq(pin)
to get the current configuration of an pin, and which IRQ
(if any) maps to it.

Signed-off-by: Ben Dooks 

Patch from Ben Dooks

USB power control and over-current sense

Signed-off-by: Ben Dooks 

Patch from Ben Dooks

Port power control and management for S3C2410 internal
USB controller for different boards to interface their
power control system to.

Signed-off-by: Ben Dooks 

Patch from Sascha Hauer

This patch fixes the i.MX timer functions:
- imx_gettimeoffset() now returns proper values
- fix timer interrupt frequency

Signed-off-by: Sascha Hauer 

After the "ppc64 monster cleanup," I get

    powerpc-750-linux-gnu-strip: vmlinux: File format not recognized

from my ppc32 strip command when cross-compiling a ppc64 kernel, since
vmlinux is a 64-bit ELF file.  This patch fixes my build (and the
resulting kernel boots fine).
Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Ulrich Drepper points out that EPOLL_CTL_DEL doesn't need to copy any of
the hash events.

Also, we should specify in the man pages that a NULL is allowed in
EPOLL_CTL_DEL.  Currently it does not say that. 

Also, starting from when epoll uses rbtrees instead of hashes, the
'size' hint passed to epoll_create(2) is no more used.  But since an API
change has clearly to be excluded, I guess it'll stay as is.
Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add $DEVPATH to the environmental variables during /sbin/hotplug call.
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@optonline.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Josef "Jeff" Sipek <jeffpc@optonline.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Make the PowerMac7,3 no longer unknown.
Signed-off-by: Andreas Schwab <schwab@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Missing up() on an error path.

Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

into cantab.net:/home/src/ntfs-2.6

      where we forgot to unmap the extent mft record when we had finished
      enumerating an attribute which caused a bug check to trigger when the
      VFS calls ->clear_inode.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

Document DRM's usage of 'd' as its ioctl identifier.  This can't be
changed, it is in every X server.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

If the blockdev doesn't implement BLKFLSBUF and returns -ENOTTY we should
still go ahead and perform the VFS-level sync.  We need to test for both
ENOTTY and EINVAL because some SCSI drivers incorrectly return EINVAL.
Signed-off-by: Ed L Cashin <ecashin@coraid.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Remove lingering PC-9800 doc.
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

thanks Xu for noticing, some whitespace found it's way there.
clean that up.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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