into nuts.ninka.net:/home/davem/src/BK/sparc-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

We had a dummy dependency on include/linux/compile.h, but it really caused
more trouble than benefits. It's not actually needed for the module
postprocessing, it was only put there to make sure we recognize when
gcc changed under us. However, we really can only do so much, and
the rest of kbuild won't notice a changed gcc either, so if the user replaces
gcc during a build, he just can't rely on the build doing the right thing.

The common cases are still covered, anyway. When the command to invoke
gcc changes ("CC=gcc32") we notice, and when the path to

	/usr/lib/gcc-lib/i386-redhat-linux/2.96/include/stdarg.h

changes (which luckily contains the "2.96", we'll notice and handle that,
too.

1) Remove dep from "make help", it is no longer useful
2) replace Generating with GEN when generating version.h

When a rule in the top-level Makefile includes scripts as one
of the prerequisites it inherits FORCE, and thus is always build.
include/linux/autoconf.h recently included scripts hereby forcing
split-include to be run for each compilation.

Fix all rules that lists scripts as a prerequisite but did not list FORCE.
Fixed by listing the executable needed direct.

We don't really have a nice way to say "compile this when CONFIG_FOO
is y, don't otherwise".

Alternatives are:

obj-$(subst m,,$(CONFIG_FOO)) := foo.o

or

obj-$(CONFIG_FOO)	:= foo.o
obj-m :=

or

obj-y			:= do_foo.o
do_foo-$(CONFIG_FOO)	:= foo.o

I chose the last one, though I'm not particularly happy with either.

This patch fixes what might have been a joke, but wasn't.

 Coverted -> Converted

One down, 285 to go.

Patch from Stephen Cameron <steve.cameron@hp.com>

Add new big passthrough ioctl to allow large buffers.  Used by e.g.  online
array controller firmware flash utility.

Patch from Stephen Cameron <steve.cameron@hp.com>

Add CCISS_GETLUNINFO ioctl.

This ioctl returns the LUNID, number of partitions, and current number of
opens on a logical volume.  Used by the array config utility or any app that
needs to send passthrough commands to a particular logical disk.

Patch from Stephen Cameron <steve.cameron@hp.com>

* add cmd_type to sendcmd parameters to allow scsi messages to be
  sent down.
* factor out duplicated code into fill_cmd function.

Patch from Stephen Cameron <steve.cameron@hp.com>

Make cciss driver retry 3rd party bus reset aborted commands up to 3 times.
(ported to 2.5 by me, original patch by Charles White)

This is needed for a multi port storage box that can have multiple hosts
connected to it, or be used in a multipath configuration.  In certain
configurations SCSI bus resets initiated by one host may affect another host.

Patch from Stephen Cameron <steve.cameron@hp.com>


* Make cciss driver wait longer for board to enter simple mode to
  handle an unlikely corner case.  (Hot replace of failed 144GB
  drive in RAID 5 set at just the wrong time prior to driver loading
  can make the board take a longer than usual time to go into "simple
  mode".  Without the patch, the driver gives up too early, and consequently
  doesn't work.  (A reboot will generally "fix" it.)  This patch avoids
  the problem.
* Fix a couple ioctls to return EAGAIN instead of inappropriate EFAULT.

Patch from Rohit Seth

ia64 reserves virtual address region 4 (any address which starts with 0x4)
for huge pages.

Apparently, for hardware reasons, we do not wish to allow mappings with
other page sizes to appear in that region.

This patch prevents the user from being able to place regular MAP_FIXED
mappings into region 4 on ia64.  It is a no-op for ia32.

Patch from Rohit Seth.  Updates the hugetlb page documentation.

Patch from Rohit Seth.  Remove a dead declaration.

Patch from Christoph Hellwig <hch@sgi.com>

There's a bunch of minor fixes needed to disable the swap code for systems
with mmu.

Patch from "Vitezslav Samel" <samel@mail.cz>

Obvious fix of printk level (wrong since 2.5.62).

Forward port of a change which Ted made to 2.4's ext2.

HTREE backwards compatibility patch.

"I thought (and assumed) this patch had been applied to both the ext2 and
 ext3 filesystems in the 2.4 kernel.  It turns out it had only made it into
 the ext3 filesystem code.  This means that if an HTREE-enabled filesystem is
 mounted using ext2, it will corrupt the filesystem as far as e2fsck and an
 ext3 htree-enabled kernel is concerned.  (The corruption won't cause any
 data loss, but it will cause e2fsck and an ext3-htree kernel to omit a lot
 of warning messages.)"

Patch from Matthew Dobson <colpatch@us.ibm.com>

Consolidate alloc_pages() and alloc_pages_node().  There is no change in
sizeof(vmlinux).

Patch from: john stultz <johnstul@us.ibm.com>

The kernel will currently panic if it was built with CONFIG_X86_TSC and
someone boots it with `notsc'.

Change it to just print a warning.

Patch from Thomas Schlichter <schlicht@uni-mannheim.de>

Based on a patch from Dave Jones.

It converts a large number of instances of:

	smp_call_function(foo);
	foo();

into

	on_each_cpu(foo);

and in doing so fixes up the preempt-unsafeness of the first version.

Patch from Maneesh Soni <maneesh@in.ibm.com>

It's supposed to return an ERR_PTR value on error, not NULL.

The loop driver takes a copy of the data which it is writing.  When this
happens on the try_to_free_pages() path, loop can easily consume ALL memory
and bio_copy() will fail to allocate a page.

Loop forgets to check the bio_copy() return value and oopses.

Fix this by dropping PF_MEMALLOC and throttling to the block writeout speed.

The patch exports blk_congestion_wait() to modules for this.  This is a
needed export: several filesystems have a "try to allocate and yield if it
failed" loop and blk_congestion_wait() is a more appropriate way of
implementing the sleep in this situation.

Patch from Nick Piggin <piggin@cyberone.com.au>

Closes a window in which we can get an invalid (already dispatched) request
in the next_drq cache.

This fixed an oops which was reported by Janet Morgan.

Patch from Anton Blanchard <anton@samba.org>

e100 is performing a header checksum calculation which is

a) duplication of the core kernel's calculation of the same and

b) incorrect on big-endian machines.

This fix has been tested on ia32 and pppc64 and acked by davem, jgarzik
and Scott Feldman

s/seperate/separate/

Fix socket memory mapping bug - we need to take account of the
requested card offset when returning the address for ioremap. 

Request PCMCIA socket resources without marking them busy - this
allows future modifications to pcmcia to allow it to claim the
CIS resources for statically mapped sockets.

Sanitise our pcmcia interrupt handling.  Make sure we only use
set_irq_type after the interrupt has been registered.

Register the socket handling interrupts using the function name
rather than some pointer passed by the generic code.

Let the generic sa11x0 code handle the cards interrupt masking.

Remove get_irq_info method, passing the information via the init
method instead.  The IRQ allocated to a socket never changes on
these platforms, so the extra code was just bloat.

Convert all SA11x0 drivers to register with the Linux driver model,
so they work with the pcmcia layer in 2.5.63.

Make low level socket_status() method take the socket index as an
argument in the same way that our other methods do.  socket_status()
now only returns the status of the requested socket, not all sockets.

Make low-level configure_socket() method take the socket number as
a parameter rather than embedded in a structure.