changes, so this is the merge of his work into my own.

	may be loaded/unloaded/reloaded

Update scsi.c for struct list_head in upper layer templates
Update scsi.c for new module loader semantics

- Comment out GET_USE_COUNT, it's a bogus test anyway
- Don't panic on failure to allocate sg table slab slots, fail gracefully
- init_scsi() leaks all sorts of crap on failed module load

into aladin.rdu.redhat.com:/usr/src/2.5

dasd_proc.c : should be using ->owner instead of MOD_..._USE_COUNT in
->open()/->release().

s390/char/tape.c, s390/char/tapechar.c, usb/image/scanner.c,
intermezzo/psdev.c: ditto

intermezzo/super.c: they forgot to remove MOD_INC_USE_COUNT from the
..._fill_super()

binfmt_som.c: ->load_binary() and ->load_library() don't need
MOD_INC_USE_COUNT, since ->module is correctly set.

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

devfs_register_tape() returns the number it had assigned to tape.

new helper: devfs_unregister_tape(number) - removes symlink created by
devfs_register_tape()

devfs_register_tape() doesn't use devfs_auto_unregister() anymore.

devfs_register_tape() gets devfs entry of directory, instead of that of
a random file in that directory.

users updated

dm-ioctl.c does, er, interesting things to figure out the name of devfs
node it had just created.  Cleaned up.

dv1394.c piles amazing amounts of crap around its devfs entries.
Probably a result of times before devfs_find_and_unregister()...

In any case, code switched to use of devfs_find_and_unregister(),
crapectomy performed...

- Improved file cleanup code

- A more uniform poll queueing interface with tips from Manfred

- The f_op->poll() is done outside the irqlock to maintain compatibility
	with existing drivers that assume to be called with irq enabled

- Moved event mask setting inside ep_modify() with tips from John

- Fixed locking to fit the new "poll() outside the lock" approach

- Bufferd userspace event delivery to reduce irq_lock/irq_unlock switching
	rate and to reduce the number of __copy_to_user()

- Comments added

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 aladin.rdu.redhat.com:/usr/src/2.5

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.