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

copy_from_user() moved from dvb_ringbuffer_{write,pkt_write}() to callers;
these functions are always getting kernel pointer now.  "usermem" argument
killed, code annotated.

	->readstat() and ->writecmd() are always getting a userland pointer;
marked argument as such, killed "user" flag, killed dead code.

	inlined functions moved, a couple of heavy-weight ones (issue_scb()
and meg_cmd_done()) uninlined.

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

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

into foobazco.org:/sources/2.5-sparc-todave

into kernel.bkbits.net:/home/wesolows/sparc32-2.6

into foobazco.org:/sources/2.5-sparc-todave

gcc doesn't understand that "asmlinkage" routines have the
argument stack owned by the assembly-language caller, and the
recent sparse cleanup made gcc think it owns enough stack
frame space to make a tailcall by overwriting "struct pt_regs"
that is set up by the low-level system call code.

Hide that problem again.

The real fix would be to tell gcc that the caller owns the
stack frame that it set up, but we don't have any such
interfaces, so for now the best we can do is to hide it.

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

After Andi's timestamp optimizations we don't have any timestamps on the
packets unless someone requested them. Here's a patch for 2.6 to
explicitly timestamp the packets before we log them.

Harald approved it some time ago, he's pretty busy so I'm sending it
instead.
Signed-off-by: Martin Josefsson <gandalf@netfilter.org>
Signed-off-by: David S. Miller <davem@redhat.com>

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

This patch solves Bugzilla #2445 by removing a no longer available URL 
from the help text for NET_IPIP.

Noted by Nils Hammar <m4341@bedug.com>.
Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
Signed-off-by: David S. Miller <davem@redhat.com>

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

0->NULL conversions in mtd

mtd, jffs and jffs2 switched from iovec to kvec

When Anton uninlined them, he didn't remember to export them
to modules..

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

The patch below (already ACK'ed by Randy Dunlap) kills the unused
IKCONFIG_VERSION from kernel/configs.c .

This patch is based on a previous patch by Anton Blanchard and an idea of
Bartlomiej Zolnierkiewicz.  (I hope I haven't forgotten anyone who contributed
to this patch.  ;-) )
Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

CONFIG_H8 in drivers/char/ depends in both 2.4 and 2.6 on
CONFIG_OBSOLETE which is never enabled.

To remove this driver, the following is required additionally to the 
patch below:
  rm drivers/char/h8.c
  rm drivers/char/h8.h

This patch was already ACK'ed by Richard Henderson.
Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The patch below solves Bugzilla #3014 by removing much outdated information
from the ext2 help text.

The help text is now very short, but few correct information is better than
outdated information - and if you think it's too short, feel free to send a
patch that adds more current information.
Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>