Hi Miklos,

It looks like everything in the vfs-miklos tree is now in Linus' tree or
the vfs tree but as different commits and so is causing merge conflicts.
Could you please clean it up, or should I just drop it now?

-- 
Cheers,
Stephen Rothwell