sys_sendfile() call,

    do_sendfile(out_fd, in_fd, &pos, count, MAX_NON_LFS);
        in_file->f_op->sendfile(out_file, in_file, ppos, count);

But,

ssize_t generic_file_sendfile(struct file *in_file, struct file *out_file,
			      loff_t *ppos, size_t count)

fist arg of generic_file_sendfile() should be for output. This patch
fixes this typo.

There are a number of places where generic_file_write could be used if
it didn't take i_sem by itself or where it doesn't need it:

(1)	XFS needs to do some preparation in it's write file operation
	(most notably taking it's own per-inode locks), after taking
	i_sem, but before calling the guts of generic_file_write.
(2)	blockdevices are happy with parralel get_block() operations,
	and there is nothing i_sem could protect.

This patch introduces a generic_file_write_nolock and makes the good old
generic_file_write a wrapper around.  The block device code is switched
over to it.

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.

These are the completely generic bits (linux/init_task.h and linux/wait.h).

From: Art Haas <ahaas@neosoft.com>

  Here's the latest diffs for the files in include/linux.
  Patches are against 2.5.31.

The following patch from Anton Blanchard fixes a problem with the
sym53c8xx_2 driver in the 2.5 tree.  It assumes that the eh error
handlers are not called with the host lock held, which they are.

The code already copes with the possibility of having
read some of the 4byte length but not all, but can never
get into that situation.  We just need to add a 'return'
for the case where read got some data but not enough.
Either 0 or -EAGAIN could be returned, they both have the
same effect.

Now that we actually do shutdown the socket, we should
say so instead of just saying that we should....

Otherwise if you cannot stop and restart nfsd while a client holds a
connection.  Why this isn't the default I cannot imagine...

Currently svc_sock_setbuf can be called under a spinlock,
but it can try to lock a socket, which can block....

Now when we decide that changing the size might be good we
set a flag (SK_CHNGBUF) and then later (when the next
packet arrives) we change the sizes appropriately.

This (tested) patch fixes APM support on 2.5.31-BK.  The patch is based
on Stephen Rothwell's patch.

into home.transmeta.com:/home/torvalds/v2.5/linux

into home.transmeta.com:/home/torvalds/v2.5/linux

- Unlock the page in an out of memory error code path in
  fs/ntfs/aops.c::ntfs_read_block().
- If fs/ntfs/aops.c::ntfs_read_page() is called on an uptodate page,
  just unlock the page and return. (This can happen due to ->writepage
  clearing PageUptodate() during write out of MstProtected()
  attributes.
- Remove leaked write code again.

into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5

The following patch corrects a bug where rmap would continue trying to
swap out a page even after it failed on one pte, which could result in
leaked pte chains and a bug when exiting applications which use mlock().

The bug was tracked down by Christian Ehrhardt, the reason it wasn't
found earlier was a subtlety in the code, so I've taken the liberty of
changing Christian's patch into something more explicit, we shouldn't
let this one happen again ;)

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

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

Misc.  compile fixes, xd.c switched to per-disk gendisks, Alan's 2.4
fixes for xd.c ported.

DAC960 switched to per-disk gendisks.

	KOCHI Takayoshi.

Make MP bootup work again.

into nuts.ninka.net:/home/davem/src/BK/net-2.5

The s/at_addr/atalk_addr/ in atalk.h broke the compilation of
drivers/net/appletalk/*. The patch below fixes it. From Adrian Bunk.

3 TLS entries, 9 cycles copying and no branches in the context-switch
path. The patch also adds Christoph's suggestion and renames
modify_ldt_ldt_s (yuck!) to user_desc.