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

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

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

Also clean it all up - use get_cpu()/put_cpu() instead of
playing games by hand with preemption.

Al missed this one in his sparse fixes
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

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

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

Split ata_eng_timeout into the main part (ata_qc_timeout)
and the part called by the SCSI layer (ata_eng_timeout).

Zero behavior changes.

On Sun, Jun 20, 2004 at 05:46:32PM -0700, Andrew Morton wrote:
>...
> All 226 patches:
>...
> bk-libata.patch
>...

drivers/scsi/hosts.h is obsolete, use scsi/scsi_host.h.

Please apply
Adrian

by "other". The normal permissions for the kernel tree
should be -rw-r--r--.

sock_fprog instances that had kernel pointer in ->filter (both of them -
in ppp_generic and isdn_ppp) replaced with explicit pairs len + kernel
pointer.  Copying of userland sock_fprog (with its __user ->filter)
cleaned up and sanitized.

Trivial annotation done in the rest of ->ioctl() in ppp_generic and
isdn_ppp.

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

into intel.com:/home/lenb/bk/linux-acpi-test-2.6.7

Reflect that only the dstirq depends on the dstapic.

into intel.com:/home/lenb/bk/linux-acpi-test-2.6.7

caused by errant fix for OSDL 2835

Requested by Promise.  The hardware isn't widely deployed yet,
with almost all users being early evaluators, so this should be OK.

Signed-off-by: Andrew Morton <akpm@osdl.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>

Make sure we only clear q->last_merge hint, if it matches the request
currently passed in.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

To prepare kbuild for more kernel packaging formats move all packaging support
to scripts/package.

In top-level Makefile introduce generic support for all package formats using
target names *-pkg.  Included the old rpm target for backward compatibility.

A new variable KBUILD_IMAGE is used to specify what kernel image will be part
of the final package, and is to be set by the arch specific makefile.
KBUILD_IMAGE may be overridden from command line or environment.  KBUILD_IMAGE
will see wider usage later, mainly when installing kernel images.

Introducing KBUILD_IMAGE allowed arch specific details to be deleted from the
mkspec and builddeb scripts.

While in the process added the deb packet format.  Script is From: Wichert
Akkerman <wichert@wiggy.net>

To create a RPM packet use 'make rpm-pkg'.
To create a deb packet use 'make deb-pkg'.
Both targets are included in 'make help'
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

When using a separate output directory the in-kernel config wiere rebuild
each time the kernel was compiled.  Fix this by specifying correct path to
Makefile in the prerequisite to the ikconfig.h file.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

allmodconfig and allyesconfig are currently failing because they select
wanxl firmware rebuild, and that requires an m68k assembler toolchain.

Add a new generic option to the "Generic Driver Options" menu.  The option
is defaul equals y and prevents us from building firmware unless really
needed.

Firmware is usually provided in separate filer '_shipped', and there is no
need to rebuild them unless strictly required.  First user is WanXL - which
otherwise required a m68k tool-set to compile.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix path in <linux/idr.h> header file.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

drivers/video/tdfxfb.c:1104: warning: initialization discards qualifiers from pointer target type
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Lindent rwsem.c and rwsem-spinlock.c and fix a few things by hand.  Also
added a couple of comments for the memory barriers.  Added the __sched
annotation that was left out of rwsem-spinlock.c.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>