Here are a few C99 initializer patches for files in fs/nls.

I believe the comments about locking in net/ipv4/netfilter/ip_tables.c
are outdated/misleading.  Please consider the following comments instead
(or something similar).

The "unRaw" option for the magic sysrq key fails to compile if
CONFIG_VT is false.  This patch fixes that:

The old form of designated initializers are obsolete: we need to
replace them with the ISO C forms before 2.6.  Gcc has always supported
both forms anyway.

We need this small change to drivers/scsi/Config.in.  It only affects
people using powermacs since the MESH hardware only exists on
powermacs and clones.

Update my email address and fix an ancient miscalculation. One could argue
that this driver should just be removed. I sent these changes to the
maintainer a few years ago and got no reply.

For 2.5 Gerd Knorr is the video4linux/v4l2 maintainer not me
kraxel@bytesex.org or the list video4linux-list@redhat.com - which is
hosted at but not an RH specific list.

This makes the CONFIG_VIDEO_PROC_FS question depend on CONFIG_PROC_FS.
Additionally, this changes all tests/comments about CONFIG_PROC_FS &&
CONFIG_VIDEO_PROC_FS to be just CONFIG_VIDEO_PROC_FS.

Here are a couple of patches for files in include/asm-i386. Patches
are against 2.5.31.

<linux/config.h> has the normal idempotent construction.

The attached file removes the second #include.

<linux/pagemap.h> has the normal idempotent construction.

The attached file removes the second #include.

[ It's strange how many of us can't spell weird ]

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

Silence hotplug printk()s in input.c
More careful probe and init in atkbd.c and psmouse.c
to avoid triggering bugs in certain keyboards.
Accept old AT (non PS/2) keyboards with limited command set.
Accept Logitech mice which can only do IMPS/2 and not PS2++.
Use a buffer in i8042.c to avoid spinlock deadlocks when
serio_write is called from within serio_interrupt.
Only ask keyboard to resent if the keyboard is there (ie no timeout).
Linus, this should fix both your keyboard and your mouse!

buffers via usb_buffer_alloc in 2.5.x  This helps platforms
where doing a pci_{map,unmap}_single() on every input event
is very inefficient.

Also adds a missing kfree(hid), because the HID struct was never
freed.

Use the new max cache alignment to optimise the layout of struct zone.

struct zone goes from ~270 bytes (UP) to 768 bytes (SMP, x86).  This is
not a trick which should be generally used.

zone->lock and zone->lru_lock are two of the hottest locks in the
kernel.  Their usage patterns are quite independent.  And they have
just been put into the same structure.  It is essential that they not
fall into the same cacheline.

That could be fixed by padding with L1_CACHE_BYTES.  But the problem
with this is that a kernel which was configured for (say) a PIII will
perform poorly on SMP PIV.  This will cause problems for kernel
vendors.  For example, RH currently ship PII and Athlon binaries.  To
get best SMP performance they will end up needing to ship a lot of
differently configured kernels.

To solve this we need to know, at compile time, the maximum L1 size
which this kernel will ever run on.

This patch adds L1_CACHE_SHIFT_MAX to every architecture's cache.h.

Of course it'll break when newer chips come out with increased
cacheline sizes.   Better suggestions are welcome.