Split xfrm_state_replace into xfrm_state_add and xfrm_state_replace.

Fixes:
1. Only update update lifetime and encap options if the state is valid.
2. Disallow updates to states that do not exist.
3. Bail if afinfo cannot be found.
 
This brings SADB_UPDATE in line with what is required by RFC2367.
It is also needed by SFS NAT-T support as it needs to update valid
states when the encap ports move.

I've tweaked the logic slightly so that SADB_UPDATE will fail on a
larval state that hasn't undergone SADB_GETSPI.  This is what RFC2367
calls for and it simplifies the code in that we don't have to call
find_acq for SADB_UPDATE.

This doesn't affect any of the three KMs as they either don't use
SADB_UPDATE or call SADB_GETSPI before doing an update.

nmclan_cs doesn't compile with older compilers

From: Nick Piggin <piggin@cyberone.com.au>

It converts writes to reads and we end up returning the request to the wrong
queue.

The ext3 version number hasn't been updated since ext3 was merged.

We track ext3 via the kernel release ID.  Remove the ext3 version
number.

From: Philippe Elie <phil.el@wanadoo.fr>

kmem_cache_destroy() can fail with the following error: slab error in
kmem_cache_destroy(): cache `xxx': Can't free all objects but the cache
user really free'd all objects

This is because drain_array_locked() only frees 80% of thge objects.

Fix it by adding a parameter to drain_array_locked() telling it to drain
100% of the objects.

From: Bob Miller <rem@osdl.org>

Removed the check_mem_region() call and replaced with request_mem_region().

Because of the way the driver is structured the first request_mem_region()
call gets the default memory area.  After probing the complete memory area
that is needed to communicate with the device is known, so the first memory
area is released and the complete area is requested.

From: Bob Miller <rem@osdl.org>

- Replace the call to MOD_INC_USE_COUNT with a __module_get() when
  forcing the module to not be unloadable.

- Remove the check_region() calls and restructured things to only use
  request_region().

From: Kouichi ONO <co2b@ceres.dti.ne.jp>

in 2.5.73, I can't read/write mount DVD-RAM via ide-scsi (only r/o mount).
Without ide-scsi, I can mount DVD-RAM read/write mode and works fine.

(acked by Jens).

From: Andi Kleen <ak@suse.de>

Add proper EFAULT reporting to sys_syslog.

This fixes some silly LTP test in the 32bit emulation of an AMD64 kernel.

From: Oleg Drokin <green@namesys.com>

Fix BUG_ON(!buffer_mapped(bh)) in submit_bh()

Reiserfs is submitting unmapped buffers into submit_bh(), which trips a
BUG.

Make sure that the address_space is capable of performing the readahead
before going in and allocating the pages.

This fixes the kernel crash in the case when we do an SIOCSIFNAME
ioctl on /proc/net/dev to rename a network interface, and
we supply a string such as "foo%sbar".

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

into are.twiddle.net:/home/rth/BK/axp-2.5

Fix PPP over async regression that the PPPoE changes caused.
Basically, PPP puts a zero length skbuff in the receive queue
as an error token, and the last change caused that to get flushed
as bad data.

Thanks to Diego Calleja Garcia, Matthew Harrell for validating this.

hwif->udma_four is always preset to 0

Make the IDE driver return the proper status return
for unhandled interrupts.

- do not enable TCQ in ide_init_drive(), its too early
- enable TCQ in __ide_dma_on() only if CONFIG_BLK_DEV_IDE_TCQ_DEFAULT=y
- try to enable TCQ only on disk drives
- correct check for two drives on one channel

into kanga.twiddle.net:/home/rth/work/linux/axp-2.5

This patch moves all the duplicated cdrom Kconfig bits from arch/*/Kconfig
to drivers/cdrom/Kconfig

Add return statement to tty init function of 3215 driver.

Fix typos.

Pass correct argument to SET_MODULE_OWNER.

- Simplify long busy condition handling, add quiesce/resume ioctl.
- Add sense data area to reserve/release/steal_lock ccw-chains.

- Make ccwgroup online attribute consistent with ccw online attribute.
- Add link incident record handling to channel subsystem code.
- Do path grouping only if the device driver explicitly requests it.
- Fix multicast or broadcast flood ping hand on HiperSockets.

- Add missing includes to compat_ioctl.c.
- Fix 32 bit emulation of sys_settimeofday.

- Remove unused variables from smp.c.
- Reserve system call number 110 for sys_lookup_dcache.
- Fix show_trace.
- Remove superfluous asm include file.
- Add statfs64 structure.

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

In general, it is more better to use get_cpu_var() and __get_cpu_var()
to access per-cpu variables on this CPU than to use smp_processor_id()
and per_cpu().  In the current default implemention they are equivalent,
but on IA64 the former is already faster, and other archs will follow.

Make the ROMfs copy in the startup code for NETtel/5272 board
conditional on actually using a ROMfs setup.