into kroah.com:/home/greg/linux/BK/usb-2.6

This all because of stupid hardware implementations that can't decide
which endian form they want to run the chip in...
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

- Updated to version 0.7.

- Added support for Edgeport 4s, 221c, 22c, 21c, 1, 1i, Watchports,
  Plus Power Port HP4CD, and Plus Power Port PCI.

- Added a circular write buffer and locking to protect it.  This fixes
  OPOST processing problems.

- Rewrote TIChase to wait for the circular buffer to drain, to wait
  up to the closing wait time, and to wait for the last character out.

- Fixed hardware flow control by having it stop and restart reads
  and set and clear tty->hw_stopped.

- Removed the RELEVANT_IFLAG macro which mistakenly filtered out the
  software flow control stty flags.

- Added a semaphore to to protect num_ports_open to fix a race
  during simultaneous opens--two opens could both try to submit
  the interrupt urb, an error.

- Added a separate write_urb_in_use flag rather than relying
  on (urb->status == -EINPROGRESS).

- Added edge_tty_recv to pass data to the tty flip buffers.

- Freed memory on failed startup.

- Added low latency as a module parameter, it is on by default.

- Added closing wait as a module parameter, it is 40 seconds by default.

- Simplified rounding the baud rate divisor.

- Added some error messages.
Signed-off-by: Al Borchers <alborchers@steinerpoint.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This patch frees interrupt_out_buffer in the cleanup routines.

Signed off by: Lonnie Mendez <lmendez19@austin.rr.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

The more relaxed memory ordering od the __raw_{write,read}b broke things
on ppc in the recent rivafb cleanups.

[ Uglyness alert: only the 8-bit accesses are more strongly serialized. 
  The 16- and 32-bit ones have always been relaxed. Gaah. ]
Signed-off-by: Guido Guenther <agx@sigxcpu.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into kroah.com:/home/greg/linux/BK/usb-2.6

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

Patch from Nicolas Pitre

The declaration of generic_fls recently changed from
extern inline to static inline.

Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King

Patch from Ben Dooks

Add register definitions for channel hardware
sources, and update for s3c2440 extra bits.

(should be applied after #2226/1 and #2227/1)

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Ben Dooks

Added EXPORT_SYMBOL() to appropriate routines

(should be applied after Patch 2226/1)

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Ben Dooks

Add sysfs class and devices for s3c24xx-dma code, and
add simple pm suspend code to ensure all channels are
stopped before suspending

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Here is a new version of the patch to usb-serial.c to fix
the unbalanced kref and module get/put in serial_open and
serial_close when there are errors.  This version works
correctly when try_module_get fails and now "rmmod --wait"
works correctly.


* If the low level usb serial open fails, the kref and
  module use counts are decremented once in open.  Before,
  they were mistakenly decremented again in close.

* If try_module_get fails, the module use count is not
  changed.  Before, the module use count was mistakenly
  decremented.  Now "rmmod --wait" works correctly.

* The tty->driver_data pointer is never set to NULL once
  the port is open.  Before there was a small window when
  it was mistakenly set to NULL for an already open port.
Signed-off-by: Al Borchers <alborchers@steinerpoint.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

[PATCH] io_edgeport locking, flow control, and misc fixes

- Updated to version 2.7.

- Added locking to protect the circular buffer, txCredits, rxBytesAvail,
  and read_in_progress.

- With these locking fixes tests running 8 ports at 115200 bps on
  SMP now runs for hours without problems; before these changes this
  test would cause out of memory errors or oopses within minutes.

- Removed the RELEVANT_IFLAG macro which mistakenly filtered out the
  software flow control stty flags.

- Added support for mark and space parity.

- Added a private read_in_progress flag rather than using (urb->status
  == -EINPROGRESS).

- Low latency is now a module parameter, it is on by default.

- Added edge_tty_recv to pass data to the tty flip buffers.

- Cleared the write_urb pointer after freeing it, to prevent oops on
  failed open.

- Cleared the txfifo.fifo pointer after freeing it, to prevent double
  free on failed open.

- Simplified rounding the baud rate divisor.

- Added some error messages.
Signed-off-by: Al Borchers <alborchers@steinerpoint.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

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

The patch below fixes a problem with shutting down 802.3ad bonds on the 2.6
kernel.  Taking the interface down or removing the module causes a stack
dump if spinlock debugging is enabled.  This patch was generated from the
2.6.9 kernel.

This patch has been peer reviewed by our Linux software engineering team,
and the fix has been verified by our test labs.
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

This patch undoes a change that we believe will impact performance
adversely, by creating possibly too long a delay between servicing
completions.  The comment pretty much explains it.  We need to call both
cleanup routines each pass through the loop, this time we have a comment
explaining why.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

Obviously pci_enable_device should be called after pci_restore_state.
Signed-off-by: Li Shaohua <shaohua.li@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

This fixes a bug where netpoll can dereference a null ifa_list pointer when
not supplied an IP address at module load and the interface is up but no IP
is configured.

Bonus: unrelated netif_running cleanup

Signed-off by: Jeff Moyer <jmoyer@redhat.com>
Signed-off by: Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

It seems to result in unexplained memory corruption. Matt is working on it.

Cset exclude: Matt_Domsch@dell.com[torvalds]|ChangeSet|20041020153622|50713

Limit the number of legacy ptys to 256.  pty_line_name() isn't capable of
generating more than 256 unique names.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

task_nice() was exported for binfmt_elf, however that's no longer modular. 
normalize_rt_tasks() is used by the sysreq code only, which isn't modular.
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- cdev_get is only used in fs/char_dev.c; move it up, make it static and
  unexport it.

- cdev_put is used in one more place (fs/file_table.c) but never in
  modules; unexport it.
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Code looks like it intended to parse "%%" in pattern string as "%".  Fix
it, so it really does that.

Compile and run tested.
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Convert MODULE_PARM() to module_param().
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Convert MODULE_PARM() to module_param().
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Updates to Documentation/md.txt - included some extra info I found out
while digging deeper into init/do_mounts_md.c
Signed-off-by: James Nelson <James4765@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The 'faulty' personality provides a layer over any block device in which
errors may be synthesised.

A variety of errors are possible including transient and persistent read
and write errors, and read errors that persist until the next write.

There error mode can be changed on a live array.

Accessing this personality requires mdadm 2.8.0 or later.
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

As the unplug timer can potentially fire at any time, and and it access
data that is released by the md ->stop function, we need to del_timer_sync
before releasing that data.

(After much discussion, we created blk_sync_queue() for this)
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Contributions from Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Sometimes it didn't read all (working) drives before a parity calculation.
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Some size fields were "int" instead of "sector_t".
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch fixes some of the drivers' fb_blank() implementation which got
the usage of the VESA_* constants incorrectly and converts them to use the
new FB_BLANK-* constants.

I'm not sure if what I did is correct for all drivers, so maintainers,
please review.

(Note: For most of the drivers, FB_BLANK_NORMAL is treated as
FB_BLANK_UNBLANK, but returns a nonzero so fbcon will do a soft_blank).
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch converts most drivers to use the new FB_BLANK_* constants.
These drivers have correct fb_blank() implementations.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The VESA_* constants in fb.h used for power management of the display is
confusing to use.  The constants seems to be meant for userspace, because
within the kernel (vt and fbdev), the constants have to be incremented by
1.  Implementation of fb_blank() varies from driver to driver:

- if-else on blank/!blank

- switch case on hardcoded numbers

- switch case on the constants + 1

- switch -1, case  on constants as is

- switch case on the constants as is (broken)

To make usage clearer, new constants are defined in fb.h:

FB_BLANK_UNBLANK  = VESA_UNBLANKING = 0;
FB_BLANK_NORMAL = VESA_UNBLANKING + 1 = 1;
FB_BLANK_VSYNC_SUSPEND = VESA_VSYNC_SUSPEND + 1 = 2;
FB_BLANK_HSYNC_SUSPEND = VESA_HSYNC_SUSPEND + 1 = 3;
FB_BLANK_POWERDOWN = VESA_POWERDOWN + 1 = 4;

Other changes:

- generic blanking code in fbcon.c (for drivers without an fb_blank hook)
  which either sets the palette to all black, or clear the screen with
  black.

- make fb_display an unexportable symbol
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The function set_con2fb_map() is getting very big.  Split it into its
component functions.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Set color depth to 8 if in pseudocolor in vesafb.  The CLUT size,
previously saved as {red|green|blue}.length, is now private to vesafb.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

The hardware cursor implementation in i810fb broke sometime during 2.6. 
Until this is fixed, temporarily use soft_cursor().
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>