Subject: linux-next: manual merge of the vfs tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 19 Aug 2008 15:23:01 +1000

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
arch/ia64/ia32/sys_ia32.c between commit
37c23e7fda6913d133ac12012395e58af1fe24c6 ("[IA64] use generic
compat_old_sys_readdir") from the ia64 tree and commit
8d88103c3046cd44df7591cb008afc22d526139b ("[PATCH] fix ia64 compat
readdir/getdents") from the vfs tree.

The former removes the code that the latter updates.  I used the version
from the ia64 tree.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/