There's a long standing bug in blk_recount_segments(). Clustering means
physical segment colascing, not hardware segment colascing. This
basically means that we are mapping more segments than here than the bio
+ requests contains, and this causes a bug in the SCSI layer for host
adapters that have CLUSTERING enabled.

This patch makes sure that we are clustering physical segments
correctly, and correctly accounting hardware segments. Please apply.

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

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

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

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

instead of home-brew PCI allocations.

instead of home-brew PCI allocations.

DMA blit and getparam support.

irq handling.

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

R200 cube map registers)

I thought I'd send the results of some experimentation of mine getting
an MGE UPS (Evolution) to talk to 2.5 ... basically it behaved after
some patches, though the "hidups" driver didn't.  They're all attached:

   - "hiddev-1.patch"  ... The default queue size was so small that this
     low-speed device couldn't queue up about 110 control requests
     (that many reports to check!) during init.

   - "hiddev-2.patch" ... Makes hid debug output more useful by
      (a) making it compile again;
      (b) adding lots of "Power Device" and "Battery System" reports,
          and putting all that data into the readonly data section;
      (c) actually printing the usage strings, if they're known;
      (d) printing a message when neither input nor hiddev claim
          the device ... likely something's wrong, like someone
          didn't configure in input subsystem or hiddev support.

   - "hiddev-3.patch" ... Teaches hiddev to expose the physical ID
     just like the input event framework does.  Useful to help sort
     out which UPS is which, so you won't power down the wrong set
     of servers by accident.

into groveronline.com:/root/bk/linux-acpi

This fixes a problem from Chris' patch, letting the driverfs files
work again.  The root cause was a duplicate "parent_dev" field,
now gone.  This also adds minor cleanup in the hcd glue, renaming
the value being duplicated as the "controller" that the HCD is
driving.  (A "parent" should rarely be used, but the "controller"
has reasonable uses all over the place ... like in dev_dbg calls!)
It's initted by the PCI bus glue, or by the SA-1111 bus glue.

Also makes some OHCI debug messages appear only when VERBOSE debug
is (manually) enabled.  This was self-defense, otherwise running
the link/unlink "usbtest" cases could fill up the log filesystem
(with debug enabled).

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

(Jak)

When using the abbreviated (non-verbose) output, show [M] when
building modules.

(Peter Samuelson)

This fixes various minor problems:

- re-orders some tests so that "(no bus?)" diagnostic should
    no longer be appearing (and making folk worry needlessly)

- removes one unreachable test for URB_TIMEOUT_KILLED

- removes the reachable test, since it's never an error on the
    part of the device driver to unlink something the HCD is already
    unlinking.

- gets rid of some comments and code that expected automagic resubmits
    for interrupts (no more!),

- resolves a FIXME for a rather unlikely situation (HCD can't
    perform the unlink, it reports an error)

It also starts to use dev_dbg() macros, which give more concise
(lately) and useful (they have both driver name and device id)
diagnostics than the previous usb-only dbg() macros.  To do this,
DEBUG had to be #defined before <linux/driver.h> is included, but
it can't be #undeffed before <linux/kernel.h> is included.

This mostly moves the initialization of some sysfs-related
fields earlier, so HCD code can access them during those
(initial error prone) parts of enumeration without oopsing.

The particular access I wanted was using <linux/driver.h>
debug utilities like dev_dbg(), dev_warn() and so on ... so
I also changed the name the "generic" driver gives itself
to be "usb" so those messages make more sense.

Also added comments about how usb_new_device() moves the
device through the other chapter 9 usb device states.

This patch shows how many configurations a device has,
which will be important for eventual user mode tools
that manage configurations.

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

into nuts.ninka.net:/home/davem/src/BK/net-2.5

Also:

. prototypes for _proc_init functions only needed in af_inet.c, and only
  if CONFIG_PROC_FS is set.
. net/socket.c needs include <linux/seq_file.h>
. review raw.c needed includes

- xfrm_state.c: never return mature SAs on getspi.
- af_key.c: do not forget to delete dummy super-larvals when they are resolved
- af_key.c: wow! specially for this case I added gfp argument
            to xfrm_alloc_policy() and forgot to use it really.

into nuts.ninka.net:/home/davem/src/BK/net-2.5

- moved some "//" remarks to "/* */"
- removed DOS carriage-return characters at end of line from one
  header-file.

(Armin Schindler)

Use Linux kernel coding style (no code changes).

(Armin Schindler)

Fixes crypto so it compiles with !CONFIG_MODULES, and cleans up two
other cases which did #ifdef CONFIG_MODULES.