From: Dave Olien <dmo@osdl.org>

Christoph submitted a patch to linus last week fixing up some DAC960 driver
entry points.  That patch will OOPS during boot on version 2 controller
types.  Christoph's version of the disk_size() function was dereferencing
a NULL pointer in it's "else" clause.

Christoph's patch hasn't appeared in linus's BK tree yet.  So, I'm
resending Christoph's orignal patch with my fix to disk_size() included.
This patch can be applied to the driver in Linus's BK tree from April 28.

Here's Christoph's original description of his patch:

Some grepping showed that DAC960's open routine was duplicating parts
of check_disk_change().  I went on fixing this by implementing a
media_changed method and making DAC960_Open use it.  While looking
at the surrounding code I noticed that

  (a) all methods weren't using the private data the upperlayer
      hands to it properly, but instead using kdev_t-based indexes
  (b) DAC960_Open/DAC960_Release was keeping never used counters
  (c) DAC960_Open was doing tons of checks the upperlayer already does
  (d) DAC960_Release was entirely superflous.

The patch below corrects that and rewrites the block entry points
into readable code - 100 LOC are gone and the same amount replaced
by readable code.

Fix a few unused var warnings in drivers/block/xd.c

From: Manfred Spraul <manfred@colorfullife.com>

apm.c:suspend() calls set_system_power_state() under (effectively)
spin_lock_irq(i8253_lock).

But set_system_power_state() unconditionally enables interrupts, in
apm_bios_call_simple().  This generates nasty warnings from the uniprocessor
spinlock debugging code, and would be deadlocky if APM worked on SMP.

So drop the locks around the set_system_power_state() call.

Update bttv driver to the new IRQ API.

Fixes a bug spotted by Alexey Mahotkin <alexm@hsys.msk.ru>: the slab-internal
SLAB_NO_GROW bit clashes with __GFP_NORETRY.

Fix that up so it won't happen again by moving the bit layout into gfp.h.

Some IRQ udpates for IRDA which seemed to get lost.

IRQ API udpate in i2c-elektor.c

Introduces __module_get for places where we know we already hold
a reference and ignoring the fact that the module is being "rmmod --wait"ed
is simpler.

Restores .modinfo section, and uses it to store license and vermagic.

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

   This one-liner is required for PCI serial ports that have multiple
MMIO ports off a single PCI BAR.  Calls to request_mem_resource() fail
after the first one otherwise.  Patch against 2.5.67.  Thanks,

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

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

Update the dcache section in Documentation/filesystems/Locking to match
reality.  Note that there's other parts of this file that are badly out
of date - I'll look into it later.

this fixes a harmless but annoying warning when compiling one of the
tape drivers without devfs.

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

The included patch cleans up the EISA code :

- Documentation update,
- Remove i386 EISA ID reservation (handled in the generic code),
- Add some preliminary support for EISA-like VLB cards (Adaptec 287x),
- Add some stricter dependancies for EISA_VIRTUAL_ROOT
- Preliminary support for EISA DMA,
- Much more conservative probing,
- EISA IDs list update (Compaq stuff).

into kernel.bkbits.net:/home/davem/net-2.5

* Need _rcu on the list_for_each_entry in br_get_port because called in
  read path for some ioctls
* Move two small functions is_root_bridge and is_designated_port into
  inlines because they are so short.

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

Thanks to Rusty for spotting this one, if the net family module is not there
anymore (or is going away at that time) it is not supported, not busy.

Thanks to Rusty for spotting this one, if the protocol module is not there
anymore (or is going away at that time) it is not supported, not busy.

With this the pppox module is protected by the networking core and
the pppox "core" protects modules for specific pppox protocols (pppoe,
for instance), while doing it removed some not needed struct sock
member initializations in pppoe_create that are done by sock_init_data.

. rename proto to pppox_protos, even being static this is too generic a name
. use rc as the name for result variables, just for consistency with other
  net sources

This is in preparation for having a proper net family module level modules
infrastructure, with the top level (af_pppox) doing the module refcounting
before calling any functions registered by the lower level protocol modules
(in this case just PPPOE for now).

. use switch/case alignment at the same column, 
  more common in the kernel sources
. remove outdated module refcounting comments
. have just one exit (return) in the ioctl functions
. use 'rc' for return variables, not ret or err, for
  consistency on naming.

These files are no longer needed due to class changes.

This isn't the optimal fix, but things still work properly for me with
my hardware and this patch.

Dominik Brodowski has stated he will be fixing up this code a lot more
after the class changes are in the main tree.

Yes, this patch is not logically correct, in that the scsi-host class
no longer works, but Mike Anderson has a patch that will be submitted
that fixes all of these problems.

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

Note, tty_class will be flushed out in the future, this is just to
get things building again properly.

Removes the device_class, devclass_attribute, and device_interface structures
and replaces them with class, class_device, and class_interface structures.

This allows us to have multiple class_device structures per device structures
which mirrors the ways things really are within the kernel.  It also allows 
class_device structures to be created later than struct devices as they
are naturally created much later in the initialization process of a device.