Hi Ralf,

On Fri, 18 Jul 2008 09:33:41 +0100 Ralf Baechle <ralf@linux-mips.org> wrote:
>
> On Fri, Jul 18, 2008 at 03:36:29PM +1000, Stephen Rothwell wrote:
> 
> > Today's linux-next merge of the vfs tree got conflicts in
> > arch/mips/kernel/irixelf.c and include/asm-mips/namei.h between commit
> > 2957c9e61ee9c37e7ebf2c8acab03e073fe942fd ("[MIPS] IRIX: Goodbye and
> > thanks for all the fish") from the mips tree and commit
> > 2d810d154f1ffc5c637acdb067693773efb09540 ("[PATCH] kill altroot") from
> > the vfs tree.
> > 
> > I removed both files.
> 
> Removing arch/mips/kernel/irixelf.c is fine but removing <asm/namei.h>
> will break the build of fs/namei.c.

The vfs tree patch killed all references to asm/namei.h

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