From Scott Anderson <scott_anderson@mvista.com>.

into kernel.crashing.org:/home/trini/work/kernel/pristine/linux-2.6-misc

into home.osdl.org:/home/torvalds/v2.5/linux

into home.osdl.org:/home/torvalds/v2.5/linux

1) icmpv6_send() and icmpv6_echo_reply() never release dst.
2) ip6_{push,flush}_pending_frames() leak np->cork.rt.

1) Make sym2_template.module get setup properly.  It was
   the scsi_module.c code taking care of this for us previously.
2) Zero out on-stack structures, in particular sym_dev not being
   zeroed out was causing sometimes-boots-sometimes-doesnt problems
   for me on sparc64 with sym2 non-modular.

Based upon a patch from Herbert Xu (herbert@gondor.apana.org.au).

into raven.il.steeleye.com:/home/jejb/BK/scsi-for-linus-2.6

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

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

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

This should fix the MCA problems.

I moved the name field to the struct mca_device because it was in such
extensive use, and this approach caused the least impact.

Let not my fingers type in haste.

net/netsyms.c must include linux/ethtool.h, when exporting its symbols.

When writing firewall rules, and you are serving NFS, it's really
useful to know the port numbers of the various NFS services.  nfsd has
a standard value; mountd and statd are userspace daemons, and those
ports are settable on the command line.

The fiddly one is lockd.  nlm_udpport and nlm_tcpport can be set on
the kernel command line or at module load time, but after that it's a
bit awkward (particularly as the lockd module can't be unloaded safely
- "rmmod -f lockd" sometimes panics).

This patch allows the port numbers and the other lockd parameters to
be set through files in /proc/sys/fs/nfs/nlm_*.  The port numbers take
effect when lockd is next started or restarted.

In order to install the sysctl table even when compiled into the
kernel, it was necessary to update the initialisation code to the
current methods, using module_init() et al.  This patch does that and
in so doing updates the module/kernel parameters to use the 2.6
module_param() method, as well as making the numeric range changes
consistent between the two.

The largest "unsigned int" value doesn't fit in a "long", on many machines.
So we should use simple_strtoul, not simple_strtol, to decode these values.

ethtool helpers need exporting.

This will correct the sb_card compile error from removing "name" from
"struct device".

I also decided to read the name from the card structure instead of the
device structure because, for isapnp devices, the card structure is more
likely to contain an appropriate name.

Don't prepend $(obj) to "targets", since the generic rules will
do that for us, and doing it twice just makes things not work.

into kanga.twiddle.home:/home/rth/work/linux/axp-2.5

This fixes a bug with multiple targets.

Olaf Hering reported that the build failed for PowerPc if used like
this: make oldconfig zImage

The reason for this was that .config was not present for any targets
specified in arch/$(ARCH)/Makefile and below.

That's because .config would not be included when oldconfig is present
in the list of targets.  The fix is to move handling of *config task to
the kconfig/Makefile.  Furthermore the logic in top-level makefile has
changed a bit, creating a more logial structure.  When building a fresh
kernel, the user is now told that .config is missing, not an anonymous
report that .config did not exist.

The error has survided this long because the targets used in i386/boot
in general does not use CONFIG_ symbols.

Olaf Hering has tested this patch with success.

The 'name' member of i2c clients & adapters moved again back to the
i2c_* from generic device.

Thanks to Petri Koistinen for bringing this to my attention.

From:   Muli Ben-Yehuda <mulix@mulix.org>

IMO, it's more correct to include <linux/types.h> in scsi.h, which
will bring in u8 and make scsi.h compilable on its own (provided
__KERNEL__ is defined, as it should be). 

Here's another patch in the "try and make the driver readable"
cleanup series. This one cleans up all of the list handling.

Description: Replaced the various hand crafted scsi req lists
(waiting and going in the dcb and free in the acb) and the dcb list
(in the acb) with the generic linux lists. This makes all of the list
related code a *lot* more readable then it was previously.