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

into kernel.bkbits.net:/home/davem/tg3-2.6

into kernel.bkbits.net:/home/davem/net-2.6

- The do_shmat() stub needs `static inline', not `inline'

- We need errno.h for ENOSYS.

1) Take into account the fact that struct sk_buff, which counts towards
   socket buffer limits, changes across different platforms.
2) Give ipv4/ipv6 ICMP sockets more accurately the wmem limits they
   want.

This renames sys_shmat to do_shmat.  Additionally, I've replaced the
cond_syscall with a conditional inline function.

It touches all archs - only i386 is tested.

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

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

This undef's DEBUG by default in macio_asic, this is now working fairly
well, and the actual output isn't really useful anyway.

From: Alexander Atanasov <alex@ssi.bg>

dpm_runtime_suspend holds dpm_sem and calls dpm_runtime_resume which
deadlocks.  Directly call runtime_resume instead.

From: Adrian Bunk <bunk@fs.tum.de>

GNU make 3.78 reproducible segfaults when building kernel 2.6.

See http://marc.theaimsgroup.com/?l=linux-kernel&m=107333742902438&w=2

Therefore, the minimum requirement for GNU make has to be raised in
Documentation/Changes.

GNU make 3.79.1 works.

From: Pavel Machek <pavel@ucw.cz>

In 2.6.3, cleanups arrived, and they got test for invalid frequencies
wrong.

Only first frequency is allowed to be < FID_TABLE_BOTTOM, but due to
bug it cleanups it allowed no frequencies < FID_TABLE_BOTTOM. This
fixes it.

Lots of these:

fs/partitions/efi.c:387: warning: long unsigned int format, u64 arg (arg 2)
fs/partitions/efi.c:387: warning: long unsigned int format, u64 arg (arg 3)
fs/partitions/efi.c:387: warning: long unsigned int format, u64 arg (arg 2)
fs/partitions/efi.c:387: warning: long unsigned int format, u64 arg (arg 3)
fs/partitions/efi.c:395: warning: long unsigned int format, u64 arg (arg 2)
fs/partitions/efi.c:395: warning: long unsigned int format, u64 arg (arg 3)

because it is assuming that you can print a u64 with %ld on 64-bit machines.

From: David Woodhouse <dwmw2@infradead.org>

Now that we coalesce ACKs for outgoing packets, the v.110 code needs to
look at the size it's given rather than assuming it'll get precisely one
callback for each packet sent...

From: "Randy.Dunlap" <rddunlap@osdl.org>

From: Michael Veeck <michael.veeck@gmx.net>

Removes unnecessary min/max macros and use kernel.h macros instead.

From: "Randy.Dunlap" <rddunlap@osdl.org>

From: Michael Veeck <michael.veeck@gmx.net>

Remove unnecessary min/max macros and changes calls to use kernel.h macros
instead.

From: <WHarms@bfs.de>(Walter Harms)

Hi list,
while checking 2.6.1 for missing checks(). fs/jffs/inode-v23.c
got overlooked somehow.

This patch fixes:
2 unguarded kmem_cache_create
1 unguarded proc_mkdir

From: Stephen Smalley <sds@epoch.ncsc.mil>

Looking at d_splice_alias, it appears that the security_d_instantiate call
in the first case (where it ends up moving an entry in place of the given
dentry) should be passing 'new' rather than 'dentry' to ensure that the
passed dentry is associated with the inode.  This patch should fix the
problem.

(Addresses bugzilla #2153)

ext3_error() sleeps, so don't call it with the lock held.

From: Andi Kleen <ak@suse.de>,
      From Suresh.B.Siddha

Fix another bug caused by the recent IA32e merge.  The full L1 cache size
padding of the GDT didn't work with smaller cache line sizes.  Just revert
that.

I must admit I still don't understand why it didn't work, but it's better
to have a working system for now.

From: Xose Vazquez Perez <xose@wanadoo.es>

Even master's books bring errors :-).  URL has the errata and more
information about the books

From: "Randy.Dunlap" <rddunlap@osdl.org>

This patch tries to clean up init section usage in
arch/i386/kernel/cpu/mtrr/*.c.

From: Geert Uytterhoeven <geert@linux-m68k.org>

When compiling the IPMI drivers on m68k, I needed a few more includes:

  - <asm/irq.h> (for disable_irq_nosync() and enable_irq())

  - <linux/types.h> (for size_t)

  - <asm/system.h> (for printk())

From: Manfred Spraul <manfred@colorfullife.com>

Attached is a patch that replaces the #ifndef CONFIG_SYSV syscall stubs
with cond_syscall stubs.

From: Paul Clements <Paul.Clements@SteelEye.com>

This patch removes the PARANOIA define (it was always defined anyway).  It
also removes the requests_in/out counters (which weren't always accurate,
and are superfluous anyway, since the block layer keeps its own in_flight
counter).  Also some minor cleanup of comments.

From: Paul Clements <Paul.Clements@SteelEye.com>

This patch fixes the initial set_capacity call so that it matches nbd's
internal device size (nbd_device->bytesize).

From: bert hubert <ahu@ds9a.nl>

Current bitkeeper features a cryptoloop which is not safe for journaled
file systems and also a Device Mapper target which is.  The patch below
updates Kconfig to that effect.

If you pass a huge nlen value into sys_sysctl() it will loop for hours
printing billions of question marks, so range-check the arguments.

Also, remove the code which informs the user that the sysctl is obsolete: it
allows unprivileged users to spam the logs.

From: Geert Uytterhoeven <geert@linux-m68k.org>

M68k core spelling fix (from Michael Hayes)