From: john stultz <johnstul@us.ibm.com>

- Whitespace fixes

- Fix for the case where HZ != 1000 (pointed out by Mika Penttila).

From: Manfred Spraul <manfred@colorfullife.com>

Update some no-longer-true comments around nr_threads locking.

From: Ernie Petrides <petrides@redhat.com>

The problem resolved by this patch is that if a root file system has an
error recorded from a previous mount, and then (when rebooting) the orphan
recovery procedure is initiated, the recovery is correctly skipped but the
file system is incorrectly left in a writable state.

This causes the subsequent fsck to fail due to the root file system
being dirty, and then requires manual intervention to get the system
fully booted.

From: Paul B Schroeder <paulsch@haywired.net>

The following patch simply moves the 'nr_registered_attrs' and
'device_registered' variables in mwavedd.c into the MWAVE_DEVICE_DATA struct
which is defined in mwavedd.h..

- Remove dead variable from block_read_full_page (Oleg Drokin)

From: Miklos.Szeredi@eth.ericsson.se (Miklos Szeredi)

This fixes a problem with method 0 of proc_file_read (when the whole file
is copied to the page).  The calculation of the final bytecount is wrong,
and hence smaller then page size reads will give a truncated file.

Current 2.4 kernels do it this way as well.

From: Krzysztof Halasa <khc@pm.waw.pl>

Updates the HDLC drivers to the approved module API.

From: Paul Clements <Paul.Clements@SteelEye.com>

Currently, when I build ext3 as a module, jbd gets built into the kernel
proper.  This trivial patch allows jbd to be built as a module when ext3 is
also modular.  I believe this is the intention, as this is how it works in
2.4.  I've built and tested with modular jbd and ext3 on 2.5.68.

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).