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

into nuts.ninka.net:/disk1/davem/BK/net-2.5

Now all is in llc2.ko, so no need for exporting those symbols.
Also llc_build_and_send_ui_pkt is now in llc_output.c, where it
is being exported.

into nuts.ninka.net:/disk1/davem/BK/net-2.5

into nuts.ninka.net:/disk1/davem/BK/net-2.5

into home.osdl.org:/home/torvalds/v2.5/linux

This patch moves some unnecessary global functions to the local
pnpbios include file.

It looks like this option has been moved from isapnp to resource.c,
but the MODULE_PARM line is still there:

patch from: Gerald Teschl <gt@esi.ac.at>

From: Randy Hron <rwhron@earthlink.net>

The original argument for blocking DMA 0 was to avoid conflicts with
"memory refresh"  but such configurations are only found on very old
8-bit systems that are likely not supported by the linux kernel. 
This patch allows dma 0 to be assigned to PnP devices by default.  If
for whatever reason dma 0 cannot be used, one can avoid allocating it
by setting the pnp_reserve_dma= kernel parameter.

This patch moves the detection code to a more appropriate file.

When a driver's probe routine fails, it may not release all of the
card devices it requested.  This patch allows the pnp layer to ensure
that all devices claimed by the failing driver are released properly.

Here's an updated patch that will correct the compile error when PROC
FS is disabled.  It also introduces better proc error recovery and
moves the local proc functions to the local include file.  Thanks to
Daniele Bellucci for finding the problem and contributing to this
patch.

This fixes the thread-aware /proc for CONFIG_SECURE.

bad_flp_intr() in floppy.c can cause an Oops if the I/O request is freed
but <errors> still points into the I/O request block.  Get the error
count out of the request block before ending the IO.

bad_flp_intr() oopsen reports:

  Andrey: http://marc.theaimsgroup.com/?l=linux-kernel&m=105837886921297&w=2
  John:   http://marc.theaimsgroup.com/?l=linux-kernel&m=106303650007125&w=2
  Barry:  http://bugme.osdl.org/show_bug.cgi?id=1033

From: Felipe W Damasio <felipewd@terra.com.br>

Fix a few error-path leaks in the cciss block driver.  Bug found by smatch
checker.

make_pages_present() can fail: propagate that failure back.

Spotted by Bill Irwin.

From: Adrian Bunk <bunk@fs.tum.de>

Three drivers under drivers/char/ in 2.5.72 use TWO_ZERO for compatibility
code with ancient 2.0 kernels.  The patch below removes this #ifdef'd code.

From: Christoph Hellwig <hch@lst.de>

keeping init order the same..

From: Christoph Hellwig <hch@lst.de>

now that kdev_t is gone very few places needs this still, the only header
of those beeing fs.h

From: Nick Piggin <piggin@cyberone.com.au>

If a request is merged with another, it sometimes has to be repositioned on
the rbtree - you just do a delete then an add.  This is a quite uncommon
case though.

I changed the way adding works, so collisions must be handled by the caller
instead of being dumbly fixed by the add routine.  Unfortunately the
uncommon callers weren't handling it properly.

From: Ronald Bultje <rbultje@ronald.bitfreak.net>

the zoran kernel driver is called 'zoran.o' in its CVS (historical thing, I
don't know why), and it's called zr36067.o in the kernel tree.  The
documentation in the kernel tree refers to zoran.o, though, which is (in
the kernel tree) the driver for zr36120-based cards, rather than the driver
for zr360x7-based cards.

The attached patch fixes the documentation and makes it refer to
zr36067.o instead.

From: Anton Blanchard <anton@samba.org>

I saw a lockup where 2 cpus were stuck in sem_lock().  It seems like we can
loop back to retry_undos with the lock held.  That path takes the lock so
we will deadlock.

From: Anton Blanchard <anton@samba.org>

If init_new_context fails we definitely do not want to call mmput, because
that will call destroy_context against an uninitialised context.  Instead
we should back out what we did in init_mm.  Fixes some weird failures on
ppc64 when running a fork bomb.

This patch short-circuits all the direct-io page dirtying logic for
higher-order pages.  Without this, we pointlessly bounce BIOs up to keventd
all the time.

bio_dirty_fn() needs to drop its ref against each remaining page in the BIO
before releasing the BIO.

From: Nick Piggin <piggin@cyberone.com.au>

Fix fallout from Jens' insert_here removal.  Without it its possible that a
request on the dispatch list is on the merge hash as well which is bad.  I
don't _think_ this would happen in any code paths, but I haven't looked too
closely.  It makes the API a bit less fragile anyway.