into nuts.davemloft.net:/disk1/BK/net-2.6

Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>

This one also removes the duplicate can_coalesce in tcp.c and makes it
use skb_can_coalesce.
Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>

into nuts.davemloft.net:/disk1/BK/net-2.6

into nuts.davemloft.net:/disk1/BK/acme-2.6

M68k I/O abstraction updates:
  - Make I/O ports and addresses `unsigned long'
  - Add casts to make operations warning-compatible with other archs
  - Add {in,out}[wl]_p() and {in,out}l(), which are needed for some drivers
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

M68k: Add missing atomic operations (from Roman Zippel and me) and replace
`__inline__' by `inline' while we're at it.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Mac IOP: Fix copy-and-paste bug (found by OPERA, reported by Zhenmin Li,
confirmed by Brad Boyer)
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

M68k: Make sparse work
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Mac Sonic Ethernet: Kill duplicate `MODULE_LICENSE("GPL");' (already defined in
included sonic.c) which causes a compile failure
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

AFFS: Fix oops on write after remount (from Roman Zippel):
  - Allocate/free bitmap as necessary
  - Remove last uses of SF_READONLY
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

M68k: From 2.6.7-rc1 on, it's no longer allowed to access page->count directly
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

M68k: Allow to catch a bus error via the exception mechanism (from Roman
Zippel)
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

M68k compiler updates from Roman Zippel:
  - Fix various lvalue warnings from newer gcc
  - Remove unnecessary volatile declarations
  - Change some constraints from "a" to "m" to generate slightly better code
  - Use "o" constraint for bitfield instructions
  - Use generic bitmap functions for some of the ext2/minix bitmap functions
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

M68k: Fixes for when compiling with modern gcc (from Roman Zippel):
  - Avoid warning 'use of memory input without lvalue in asm operand 0 is
    deprecated' of newer gcc
  - Replace some '%/' with offical '%%' to escape a '%'
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

IFPSP060: Make sure that the destination address of a misaligned cas access is
properly mapped in, so the kernel won't oops in the emulation handler (from
Roman Zippel).
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Recently, some distributors have set "utf8" to NLS_DEFAULT, therefore,
FAT uses the "iocharset=utf8" as default.  But, since "iocharset=utf8"
doesn't provide the function (lower <-> upper conversion) which FAT
needs, so FAT can't provide suitable behavior.

This patch does:

     - doesn't recognize "utf8" as "iocharset"
     - doesn't use NLS_DEFAULT as default "iocharset"
     - instead of NLS_DEFAULT, adds FAT_DEFAULT_CODEPAGE and
       FAT_DEFAULT_IOCHARSET
   
NOTE: the following looks like buggy, so it's not recommended

    "codepage=437,iocharset=iso8859-1,utf8"

however, some utf8 file name can handle. (in this case, it uses the
table of iso8859-1 for lower <-> upper conversion)
Sign-off-by: Jesse Barnes <jbarnes@engr.sgi.com>
Sign-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Sign-off-by: Linus Torvalds <torvalds@osdl.org>

This fixes a bug that prevent my amd64 box from booting;
numa_default_policy was __init however it's called like this in
init/main.c:

        free_initmem();
        unlock_kernel();
        system_state = SYSTEM_RUNNING;
        numa_default_policy();


eg after free_initmem(). This resulted in it being reused/freed and that
gives a nasty oops.

Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>

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

SMBulogged off.  Fixes umounting bug (pointed out by Nick Millington)
when multiple mounts with different userids are mounted to the same
server from the client.  

Signed-off-by: Steve French (sfrench@us.ibm.com)

into nuts.davemloft.net:/disk1/BK/net-2.6

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

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

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

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>

Cleanup pcnet32 IRQ handling based on suggestions from Ralf Baechle
<ralf@linux-mips.org>, and Brian Murphy <brian@murphy.dk>

Tested by myself and Brian Murphy.

Please also apply to 2.4.27-pre6.
Signed-off-by: Don Fry <brazilnut@us.ibm.com>

This patch fixes a receive hang that occasionally occurs after a Tx
FIFO underrun.  The receive dma remains in a hung state sometimes.  The
transmit operations continue to occur, but no receive activity.

This was reproduced on several ppc64 systems and the fix has been verified
there.  The patch has been tested as well on an ia32 system, which did
not experience the hang because it did not have fifo underruns, which is
a preqrequisite for the hang.  The memory barriers decreased the frequency
of occurrence.  The final change to reset the chip instead of just stopping
it eliminated the last hangs.

Please also apply against 2.4.7 (with offset of -1), tested ia32.

Signed-off by: brazilnut@us.ibm.com

This patch will discard received frames that are larger than one buffer.
This has been tested on ia32 and ppc64 systems.

Please also apply to 2.4.7 (with offset of -3), tested ia32.

Signed-off by: brazilnut@us.ibm.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.