This patch adds additional vendor and product ids for Nikon, Mustek,
Plustek, Genius, Epson, Canon, Umax, Hewlett-Packard, Benq, Agfa,
and Minolta scanners. The entries for Benq, Genius and Plustek
scanners have been updated.

I've also increased the version number to 0.4.9 and brought the
version numbers in scanner.c and scanner.h in sync.

 > ... usb-storage gets unhappy when
 > it decides (why?  and unsuccessfully) to reset high speed
 > devices.  ...

I don't know if that problem is resolved, but this patch
makes the question moot by handling an earlier error correctly.

The patch updates an incorrect test, so a short read will now
be treated as one.  Please merge.

This lets storage behave again.  As in, "mkfs -c" then copy
about 8 GB around, then 'dbench'.

These changes are unrelated except I ran into them all at once:

- Fixes an oops from a partial hub_configure() clean; let
   hub_disconnect() do the whole thing, simpler.

- Since I was there, modify that routine's err() messages
   to use dev_err().  Then eliminate a redundant diagnostic
   in hub_probe(), and merge the "bad descriptor" cases into
   one diagnostic.  Saves a few hundred rodata bytes, and
   the messages now say what hub's involved.

- Unlink fixes:  if lower level code reports a submit error,
   make sure the urb gets unlinked from the device's urb_list;
   and report "it's already being unlinked" as -EBUSY so callers
   can do something smarter than wonder "what did I do wrong".

This ought to address a number of the problems with the
recent "dummy td" update as well as some older ones:

    - Slims down the qh_append_tds() to remove two pairs
      of "should be duplicate" logic so that
        * qh_make() only creates and initializes;
        * qh_append_tds() calls it earlier;
        * always appends with dummy, no routine qh updates.

    - Reworked qh_completions() ... simpler, better.
       * two notable FIXMEs gone, and a bug related to
         how they interacted with scatterlist i/o
       * fixed bugs (including one oops) exposed by
         using dummies more.

Passes basic testing:  most 'usbtest' cases, usb2 hub
with keyboard and CF adapter, storage enumeration.
So it seems less troublesome, though it's still not
as happy as I've seen it.

However, "testusb -at12" (running 'write unlink' tests)
still fails for me, and usb-storage gets unhappy when
it decides (why?  and unsuccessfully) to reset high speed
devices.  I'm still chasing those problems, which seem
to come from higher up in the stack.

Thanks to Randy Dunlap for pointing this out.

cdc-ether has the same problem as cdc-acm.
  - usb_submit_urb() under spinlock or in interrupt must use GFP_ATOMIC

the patch turns it into GFP_ATOMIC.

this removes the spinlocks in close, so that
the synchronous unlinking is safe.

I am not sure what this code was supposed to do, but it can stop khubd
indefinitely. It has to go.

speedtouch povides an ioctl handler through usbfs.
It must not be reentered. A semaphore ensures that.

usb_clear_halt cannot be used from a completion handler because it sleeps
As that code path would have crashed the driver, it's obviously not needed
and can be removed.

   - simple spinlocks will do

irqsave spinlocks in an interrupt handler are superfluous.
Simple spinlocks are sufficient and quicker. As this is in
interrupt context, every cycle counts.

The variable 'cams' should be static.
Don't initialize to 0, while we're here.

Variables should not be defined in a header file.
This slightly improves the driver by making them
static instead of global.

into kroah.com:/home/greg/linux/BK/gregkh-2.5

into kroah.com:/home/greg/linux/BK/gregkh-2.5

This simple intermezzo Makefile change allows it to build.

OK'ed by Peter Braam.

This fixes the APM GDT entry allocation issue.  Confirmed by Andrew
Morton.

fast system calls. They should now be fully comparable to
traditional system calls.

    Fix SEP stack allocation to look like a real thread stack.
    
    This fixes the "Trap on first sysenter instruction" problem,
    which can happen either as a result of an NMI or a breakpoint
    trap (TF bit set).
    
    Also make the user trampoline save and restore EFLAGS, so that
    the TF bit gets restored after a fast system call (it will have
    been cleared to avoid trap faults in the kernel).

into home.transmeta.com:/home/torvalds/v2.5/linux

into mulgrave.(none):/home/jejb/BK/scsi-for-linus-2.5

 - add support for sending a signal on vblank
 - remove unhelpful AGP chipset strings
 - update radeon texture cache handling

into home.transmeta.com:/home/torvalds/v2.5/linux

into suse.cz:/home/perex/bk/linux-sound/work

into suse.cz:/home/perex/bk/linux-sound/linux-sound

  - intel8x0 - added NVidia NForce2 Audio PCI ID
  - USB driver - clenaups in the disconnect routine
  - added ALSA-Configuration.txt and ControlNames.txt documents

into home.transmeta.com:/home/torvalds/v2.5/linux

  - fixed compilation problem when debug is active

into suse.cz:/home/perex/bk/linux-sound/work

into suse.cz:/home/perex/bk/linux-sound/linux-sound

- some access to urb->hcpriv and urb->status needed to be
   locked using urb->lock
- paranoia: don't depend on two values being in lock-step.

trampoline.

Here's how: we re-load %ebp (arg6) in the kernel sysenter handler
from the stack, and on system call re-play we jump back in user
space to re-initialize %ebp to point to the stack pointer before
re-doing the sysenter instruction.

into home.transmeta.com:/home/torvalds/v2.5/linux

vm86 does broken tasklist scanning for matching task_struct pointers,
which is oopsable. This registers a notifier for it to GC vm86 IRQ's in
release_thread() and removes the broken tasklist scanning.

This bugfix is in 2.4.x and has been in 2.5.x-dj for an extended period
of time.

into kroah.com:/home/linux/linux/BK/gregkh-2.5

into are.twiddle.net:/home/rth/BK/axp-2.5

This patch converts most common hub diagnostics to use the
device model diagnostic macros ... not all, someone should
reduce the number of err() strings for "bogus hub" cases,
and ideally streamline some of the dozen or so "here's what's
special about this new hub" dbg() messages.

So the messages become more useful:  they id the port (and
implicitly the device) involved, using a kernel-wide standard
convention.  Size overhead is smaller too.

For folk running with USB debugging enabled, it also cuts
the useless chatter on connections by deleting the per-poll
success messages and a partial dup message when things change.
And it deletes a newish diagnostic on a (non-hub) unlink path.

It also makes Pete's new debounce message use the right
port number -- one-based, not zero-based.

My main issue with this patch is that it doesn't change
more messages, but it seems reasonable to merge it anyway.