The tc_u32_mark structure is used as part of the netlink message
from the user API to the kernel, so it needs to be moved to
include/linux/pkt_cls.h and have types changed from u32 to __u32.

Also, the definition of u32 performance counters doesn't need to depend
on the config option.  The definition can exist even if the code isn't
enabled.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial reordering of netdevice structure to save four bytes.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Patrick McHardy <kaber@trash.net>

Signed-off-by: Neil Horman <nhorman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Scott Feldman <sfeldma@pobox.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

Never called AFAICS, and only assigned -- to a no-op stub -- in
one driver.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

As promised here is the patch that moves dst_release out of
dst->ops->check.  It bloats sk_dst_check/__sk_dst_check slightly
but they're only used in a handful of places so it isn't too bad.
I actually counted, it's about a few hundred bytes.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

Tunnel mode packets are rerouted if the tunnel destination
address is different from the original destination address,
otherwise the old route is used. This is inconsistent, the
old route might have been selected for a given output device
or using routing by tos/fwmark. Always choose a new route
in tunnel mode.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

	<Patch from Adrian Bunk>
make needlessly global code static
remove unneeded EXPORT_SYMBOL's from irport.c
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

cleanup some construct obsoleted by Linus's patch
Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

	<Original patch from Steffen Pingel>
support NSC PC8738x chipset (IBM x40 & ...)
Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

	<Original patch from Iavor Fetvadjie>
allow IrDA socket to connect on arbitrary LSAPs
Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

	<Patch from Randy Dunlap>
Mark exit code properly in VIA driver
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

	<Patch from John K. Luebs>
Proper turnaround computations in the stir4200 driver
Take care of Tx packet without IrDA metadata (speed)
Signed-off-by: John K. Luebs <jkluebs@lu...>
Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Forgot to convert a few usb_unlink_urb() in usb_kill_urb()
	<Patch from John K. Luebs>
Proper sysfs support
Signed-off-by: John K. Luebs <jkluebs@lu...>
Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

poll would improperly exit when the discovery log
was empty
Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

into sunset.davemloft.net:/home/davem/src/BK/net-2.6

Use CONFIG_64BIT everywhere instead.
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Indentation and header file ordering
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The EISA EEPROM driver was being initialised too early, before miscdevs
can be registered.  But EISA needs to be registered early -- before PCI.
So stash the EEPROM address in a global variable at EISA init time,
then pick it up later in the EISA EEPROM driver.

Also ioremap() it, use readb instead of gsc_readb and rename the
miscdev to not have a space in the name.
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

There can be only one Asp in the machine, so allocate its controller
structure statically.
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Ditch ccio_mem_ratio. "Ported" from similar change to sba driver.

From: Joel Soete <soete.joel@tiscali.be>
Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - PCI_DMA_BUS_IS_PHYS is only true if we don't have an IOMMU.  Getting this
   wrong results in system panics when we run out of bounce buffers.
 - parisc_vmerge_boundary and parisc_vmerge_max_size need to be available on
   all machines, not just ones with GSC.
Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

_dbg_write_trylock() needs to return an int.
Also update Thibaut's email address
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Make access_ok an inline function to get rid of an unused variable warning
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - Match other architectures by initialising preempt_count to 1.
 - PREEMPT_ACTIVE needs to not overlap with HARDIRQ_MASK
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The extraneous semicolon in mb() breaks the SMP build in the new skbuff.h

From: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The result from __raw_readX() can never be const so use __fswabXX() instead
of cpu_to_leXX()
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

We no longer need to define our own HARDIRQ_BITS
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Copy some DMA definitions from x86 to get crufty drivers to build
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Use nonatomic bitops for ext2/3 where possible.
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add definition of SHRREG
Signed-off-by: Randolph Chung <tausq@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - Update stale url to documentation

From: Kyle McMartin <kyle@parisc-linux.org>

 - Make unwinding from modules work, mostly
 - Fix unwinding from millicode
Signed-off-by: Randolph Chung <tausq@debian.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

into sunset.davemloft.net:/home/davem/src/BK/net-2.6

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

Egbert Eich reported a bug 2673 on bugs.freedesktop.org and tracked it
down to a missing memset in the setversion ioctl, this causes X server
crashes so I would like to see the fix in a 2.6.11.x tree if possible..

From: Egbert Eich <eich@pdx.freedesktop.org>
Signed-off-by: Dave Airlie <airlied@linux.ie>