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

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

This patch squashes a bug in tcp_diag which was created when the
sk_* loops replaced the original for loops.  It's a pity that these
sk_*/hlist_*/list_* loops don't take an arbitrary expression as an
argument for continue.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

We broke ECN encapsulation in tunnels recently.
Without this patch, even though encapusulated (inner) packet is 
'not-ECN', encapusulating (outer) packet is sent with 'ECT(0)' set.
This is wrong and should be 'not-ECN.'
This patch fixes up.

From RFC3168:
   The full-functionality option for ECN encapsulation is to copy the
   ECN codepoint of the inside header to the outside header on
   encapsulation if the inside header is not-ECT or ECT, and to set the
   ECN codepoint of the outside header to ECT(0) if the ECN codepoint of
   the inside header is CE.
Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

I was fixing the tcp_diag so that it shows SYN_RECV sockets properly.
I found that /proc/net/tcp didn't do it correctly either.  So here is
a small patch to fix /proc/net/tcp.

The logic in there stinks though so I'd love to see a rewrite.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

Switch over to use the single-step scheme which x86 uses
which is to execute the kprobe instruction in the
kprobe->insn[] area.  Also, make sure the kprobe execution
runs fully with interrupts disabled, so we do not deadlock.

This required adding code to fix things up as a result of
the instruction executing at a PC which is different from
where it would normally execute.  For example, if the
instruction is a PC-relative branch, we have to adjust the
final PC value.
Signed-off-by: David S. Miller <davem@davemloft.net>

As reported by Zachary Amsden <zach@vmware.com>,
some gcc versions will inline the function even when
it is declared after the call-site. This particular
function must not be inlined, since the exception
recovery doesn't like __init sections (which the caller
is in).

sparse still complains about the games the driver
plays with user pointers, though.

It was pretty clean already, adding the proper annotations
to the base pointers and a few functions was all it took
to make sparse happy about the PCI accesses.

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

into pobox.com:/spare/repo/net-drivers-2.6

More recent versions of sparse do not define the Linux-specific
default defines, so we make the main Makefile default to the
regular Linux preprocessor defines (__linux__,  linux, __STDC__
and unix, __unix__).

Also, sparse has long since fixed the default empty define to
be "1" as in regular C, so remove the unnecessary "=1" from
the architecture-specific sparse CHECKFLAGS.

This fixes the integer underflow in task_hot() noticed by Kenneth W Chen
and makes use of p->last_ran to separate load-balancing timestamps (used
by task_hot()) from interactivity timestamps.  (which two interfered)

compiled, booted on x86 SMP.

Confirmed by Kenneth Chen <kenneth.w.chen@intel.com> to fix the db
transaction processing workload that showed the balancing problem.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

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

These two functions provide the infrastructure to manage time keeping
across a suspend/resume cycle.

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

- s3c2410 doesn't use mach-types.h
- remove unused 'ret' variable

From: Roger Blofeld

This patch modifies uart_get_divisor to select the nearest baud rate
divider rather than the lowest.  It minimizes baud rate errors.

For example, if uartclk is 33000000 and baud is 115200 the ratio is about
17.9 The current code selects 17 (5% error) but should select 18 (0.5%
error)

Signed-off-by: Andrew Morton
Signed-off-by: Russell King

It's not necessarily even true when cross-compiling the
kernel, and the right thing to do is check for __KERNEL__
(which we already do, one line up).

into nuts.davemloft.net:/disk1/BK/sparc-2.6

Ted's recent random.c update broke the periodic rekeying:
schedule_work() doesn't provide synchronization. Additionally the first
syn values after boot are generated with secret 0 - not good.

Attached is a big cleanup. Linus asked me to send to to you for merging:

The tcp sequence number generator needs a random seed that is reset every
few minutes. Since the sequence numbers should be constantly increasing,
for each rekey 2^24 is added to the sequence number.
The actual use of the sequence number generator is lockless,
synchronization is achieved by having two copies of the control structure.

The attached patch:
- fixes a race in rekey_seq_generator(): schedule_work doesn't
   provide synchronization.
- Uses schedule_delayed_work() for the rekey: simplifies synchronization
   and speeds up the hot path.
- Adds a late_initcall for the first initialization after boot.
   init_call would be too early, I've checked that the late_initcall runs
   before net/ipv4/ipconfig.c, i.e. the BOOTP/DHCP autoconfiguration.
Signed-Off-By: Manfred Spraul <manfred@colorfullife.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Fixes the existing rate estimator to compile cleanly on all platforms
and avoids carrying on the variance on platforms with HZ%4 != 0.
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>

Work done by Thomas Graf <tgraf@suug.ch> and
Jamal Hadi Salim <hadi@cyberus.ca>

The following patchset introduces generic network statistics for
netlink users. It uses nested TLV which prevents further compatibility
problems when introducing new statistics. Backward compatibility to
existing TLV types TCA_STATS and TCA_XSTATS is ensured but can be
easly removed once it is no longer needed. Therefore prior users of
struct tc_stats can be converted to this API and existing userspace
applications will not notice a difference while converted applications
can use the new extendable statistic interface.

Changes:
- Add generic network statistics API for netlink users.
- Introduces a generic rate estimator based on timers. Patch is based
  on Jamals patch and adapted to the new generic network statistics
  API.
- Add documentation of generic network statistics and estimator API.
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>

Remove useless line in cbq_dump_class probably introduced by
copy&paste from cbq_dump.
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Patrick Caulfield <patrick@tykepenguin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by; Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by; Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

 There is a problem with "struct fddi_statistics" for 64-bit systems.
The starting members of the struct are expected to correspond to the
respective members of "struct net_device_stats" (drivers for FDDI
devices return "struct fddi_statistics" in the response to the
get_stats() call of "struct net_device").  Unfortunately, due to using
different types (u32 vs ulong) they do not.  "struct net_device_stats"
is a public interface and as a result, bogus results are retrieved,
e.g. for /proc/net/dev.

 Here is my proposal to address the problem.  I think there is no
point in duplicating the layout of "struct net_device_stats" in
"struct fddi_statistics" as the former can simply be included as a
member avoiding this problem and actually any possible discrepancy in
the future.  This also preserves the layout of the structure for
32-bit systems.
Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

This patch from Herbert V. Riedel <hvr@gnu.org> adds __initdata to the
generic AES code where appropriate.  I also added __init to f_mult().
Signed-off-by: Herbert V. Riedel <hvr@gnu.org>
Signed-off-by: James Morris <jmorris@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Fix a race between neigh_timer_handler() calling down to arp_solicit()
with an sk_buff peeked from the head of the neigh->arp_queue, and
neigh_event_send() unqueuing and freeing the head of the same queue
because it's reached the maximum length of 3, by taking an extra
sk_buff reference while holding neigh->lock.
Signed-off-by: Greg Banks <gnb@melbourne.sgi.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Here is the patch from Justin Ossevoort <justin@snt.utwente.nl> to fix 
endian problem on IPVS sync message size.
Signed-off-by: David S. Miller <davem@davemloft.net>

The I2C adapter wasn't de-registered correctly in case the video card
wasn't found.  When the I2C subsystem tried to speak with the dangling
I2C adapter later on, usually an oops happened.

Roman Zippel submitted this to lk but I missed it, it does
what I tried to do badly before.
Signed-off-by: Dave Airlie <airlied@linux.ie>

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

Patch from Ben Dooks

Fixed GPG pin numbering, and missing changelog

Added code to setup the interrupt filtering on
compatible Pins

Signed-off-by: Ben Dooks

Patch from Ben Dooks

Header file defining S3C2410 SPI registers

Signed-off-by: Klaus Fetscher 
Signed-off-by: Ben Dooks 

Patch from Ben Dooks

Added documentation for the GPIO calls, updated
the overview with more information on the supported
core devices, and updated the state of the EB2410ITX

Signed-off-by: Ben Dooks