the part that got merged got broken on the way.  Here are the fixes:

Move __MODULE_INFO to modparam.h: This macro is used in modparam.h;
there are users who include this header but not module.h.  The latter
includes modparam.h already.

__MODULE_INFO(parmtype, name##type, #name ":" #type) does not evaluate
to __MODULE_INFO(parmtype, footype, "foo:int") as was the idea, but to
__MODULE_INFO(parmtype, fooint, "foo:int") when type is bound to int.
In more complicated cases, we get syntax erros.  Re-introduce the
__MODULE_PARM_TYPE macro; this is cleaner than renaming the type parameter.

Add the parmtype definition which was dropped during the merge to to the
obsolete but still heavily used MODULE_PARM macro.
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Sam Ravnborf <sam@ravnbrg.org>

"make help" doesn't show "make randconfig" nor "make config" as options
and the description of oldconfig could be better (IMHO). Patch below adds
the missing targets to the help and updates the description of oldconfig.
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

The patch below removes some false positives I've observed.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

This patch makes some needlessly global code static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

This patch makes a needlessly global variable static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

The kbuild utilities are compiled with absolute patch names, so paths
starting with $RPM_BUILD_ROOT would end up in the binaries.  To avoid
this, remove all references to __FILE__ (directly and indirectly via
assert()).
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

This adds a warning when building external modules (M= or SUBDIRS=
syntax) and there is no Module.symvers in the object tree. A missing
Module.symvers is a clear sign that the kernel tree itself was never
compiled. The resulting modules will work, but no symbol version
information will be attached to kernel symbols the module uses (because
that information comes from Module.symvers), and so the module will be
more unsafe.
Futhermore the external module will not record what other modules it is
depended on.

The test works with CONFIG_MODVERSIONS enabled or disabled.
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

From: John Kacur <jkacur@rogers.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

From: John Kacur <jkacur@rogers.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

into mars.ravnborg.org:/home/sam/bk/kbuild

Most architectures uses /boot for there kernel image, so let this be reflected
by the kernel.
If INSTALL_PATH shell variable is set then this will have effect.
If INSTALL_PATH is set one the commanline to make like this:
make INSTALL_PATH=/nfs/boot install
then this will override both kbuild and shell variable.

If an arch prefer another default this must be set in the arch Makefile
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

make install is often executed as root or on a different mechine via NFS
To avoid updating vmlinux due to directory changes or similar the install target
for i386 no longer has vmlinux as a prerequisite. 
Now modules_install and install are aligned in this respect.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

When tossing around with different gcc compilers there is no way to tell kbuild
to ignore the new name of the compiler. The new option KBUILD_NOCMDDEP tell
kbuild not to check the commandline for changes.
This should be used with care because the resulting kernel may become inconsistent
if one part is build with 2.96, and another part build with 3.3.4.
So use only when you know what you are doing.

Syntax:
make KBUILD_NOCMDDEP=1

Original request for this feature came from hpa.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Combine duplicate code in two smaller 'functions'

Signed-off-by: Sam Ravnborg

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

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

Patch from David Vrabel

Use some #define'd constants in the ixp4xx's arch_reset().

Signed-off-by: David Vrabel
Signed-off-by: Russell King

Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Signed-off-by: Russell King <rmk@arm.linux.org.uk>

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

Use netdev_priv() and get rid of the PRIV() macro by using the correct
data element. Also eliminate casts, where type is correct.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

When the skfddi driver was converted to the new PCI netdevice interface,
it never got tested with real hardware. The initialization got broken, this
should fix it.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

Fixes instances where gfar_read() was invoked in debug codewith a value,
rather than a pointer.
Signed-of-by: Andy Fleming <afleming@freescale.com>
Signed-of-by: Kumar Gala <afleming@freescale.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

From: Steven Rostedt <rostedt@goodmis.org>

If the transmit buffer of the e100 overflowed, then the system would hang.
This was caused because the e100 driver would stop the queue, and
netpoll_send_pkt in netpoll.c would then loop forever.  This is because the
e100 net_poll would never start the queue again after the transmits have
completed.

For those that use the e100 and netconsole, all you need to do is a sysreq
't' to lock up the system.
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

Fixes breakage in getting MAC address on built-in tulip in
alphastation 200 - without delay we are skipping bytes.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

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

This patch adds the Intel ICH7R DID's to the ahci.c SATA AHCI driver
for ICH7R SATA support.
Signed-off-by:  Jason Gaston <Jason.d.gaston@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

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

into silver.ucw.cz:/home/vojtech/bk/dmitry

Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>

       changing HID->event mappings (via EVIOCS*) in the future and make 
       debugging easier now.
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>

       rebooting.
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>

       good idea to discard any character other than ACK/NAK during probe
       it causes missing releases and keys getting "stuck" when a command
       issued on enabled device. The effect is easily demonstrated with
       the following command:
           while true; do xset led 3; xset -led 3; done

       With this change extra characters will be discarded only if device
       has not been marked as "enabled" yet.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru> 

into silver.ucw.cz:/home/vojtech/bk/input

looking at ext3_xattr_block_set() [fs/ext3/xattr.c] ...
I see that

                                error = -EDQUOT;
                                if (DQUOT_ALLOC_BLOCK(inode, 1))
                                        goto cleanup;

allocates a quota block, but right after that several
error echecks happen ...

                                if (error)
                                        goto cleanup;

and I don't see any DQUOT_FREE_BLOCK() in the errorpath

cleanup:
        if (ce)
                mb_cache_entry_release(ce);
        brelse(new_bh); 
        if (!(bs->bh && s->base == bs->bh->b_data))
                kfree(s->base);

        return error;

I'd suggest the attached fix.
Acked-by: Jan Kara <jack@suse.cz>
Acked-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Patch from Nicolas Pitre

This enables audio on Mainstone with the ALSA PXA2xx AC97 driver.

Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King