into pobox.com:/spare/repo/net-drivers-2.6

We better stop the queue in the close call.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

Pure microcosmetic.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

The combined allocation of of receive and transmit rings and driver data
so far made the use of netdev_priv impossible.  Split the allocation
and use netdev_priv to access the non-ring driver_private data.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

Rate limit a (apparently) harmless warning in orinoco.c

(My laptop remained connected with active X applications running over
ssh while this message was hitting every second, since I patched my
driver to include this the problem hasn't recurred.)
Signed-Off-By: Ryan Anderson <ryan@michonline.com>

Let's get this thing not using bus_to_virt() anymore,
as follows.
Signed-off-by: David S. Miller <davem@redhat.com>

===== drivers/net/hamachi.c 1.35 vs edited =====

Without this patch, insmod-ing the sunhme module crashes on my fc2
box.

		-- JF

* Resetting the adapter blew away management settings.  So we save the
important bits before performing a reset.

Sparse does not handle K&R at all, and I think I saw Linus saying that
he has no intention of adding it to sparse while ago. So here is a blob
of patch to convert drivers/net/skfp/* from K&R to ANSI-C. Compile
tested with "make allmodconfig" on x86, as I obviously don't have the
HW.

Mika
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>

From: Yoshinori Sato <ysato@users.sourceforge.jp>

- H8/300 target support
- fixed irq support
- high address (>0xffff) i/o fix
Signed-off-by: Andrew Morton <akpm@osdl.org>

Vitaly V. Bursov <vitalyvb@ukr.net> wrote:
>
> there are multiple vulns in drivers/net/eql.c
>
> if there is no such device, dev_get_by_name returns NULL and everything dies.
> Exploiting this is trivial.

Thanks for the report.  This patch should fix them.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Cheers,
--
Visit Openswan at http://www.openswan.org/
Email:  Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
===== drivers/net/eql.c 1.13 vs edited =====

This contains hpfs fixes from my source ported to 2.6.7 kernel:

updates:
- allocator fragments files less
- OS/2 Warp Server filesystem can be mounted read/only
- added reschedule points so that it doesn't hog CPU

bug fixes:
- filesystem error message when syncing or fsyncing deleted file (or when
  system just writes it on its own)
- filesystem error on extremly fragmented files
- corrupted disk structures could possibly corrupt memory

drivers/message/fusion/mptctl.c:89:24: asm/compat.h: No such file or directory
Signed-off-by: Andrew Morton <akpm@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

In base kernel 2.6.7, there is bug in function hugetlb_prefault().  The
call to free_huge_page() is incorrect and should be replaced with a call
to page_cache_release().
Signed-off-by: David Mosberger <davidm@hpl.hp.com>

This patch moves the pfm_ovfl_arg_t structure from the kernel stack
into the pfm_context_t structure. This minimizes kernel stack space
consumption.
Signed-off-by: Stephane Eranian <eranian@hpl.hp.com>
Signed-off-by: David Mosberger <davidm@hpl.hp.com>

This patch moves move_irq() from ioaspic.c to irq.c to make this common
for ia64 subarches.
Signed-off-by: Ashok Raj <ashok.raj@intel.com>
Signed-off-by: David Mosberger <davidm@hpl.hp.com>

- Handle the overlapping mmaps in the MAP_FIXED case
- Handle unmaps correctly i.e. call __ia32_delete_pp_range()
- There are now three clear entry points into the pp manipulation code
        - ia32_set_pp
        - ia32_unset_pp
        - ia32_compare_pp
- Rename internal functions to __ia32_*pp_*
- Grab mmap_sem just once at the main entry point
Signed-off-by: Gordon Jin <gordon.jin@intel.com>
Signed-off-by: Arun Sharma <arun.sharma@intel.com>
Signed-off-by: David Mosberger <davidm@hpl.hp.com>

A classic..

  lib/string.c:165:19: warning: assignment expression in conditional

From: Mika Kukkonen <mika@osdl.org>
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>

Add __user annotation for !CONFIG_MODULE_UNLOAD case.

From: Mika Kukkonen <mika@osdl.org>
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

 - added define of __x86_64__ to sparse arguments on amd64
 - switched amd64 uaccess.h to __chk_user_ptr()

removed bogus externs from declarations in fs/udf/*

misc annotation in drivers/video/* (nowhere near complete)

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