Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
arch/powerpc/kernel/sys_ppc32.c between commit
50d0b17645a26d2877c9d5538114498c3f82adac ("powerpc: Use generic
compat_sys_old_readdir") from Linus' tree and commit
7218c796efebbb70dce773d14d3cd3f359eebe2a ("[PATCH] fix powerpc compat
readdir()") from the vfs tree.

Again, the former removes the code that the latter updates.  I used the
version from Linus' tree.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/