Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
drivers/staging/pohmelfs/inode.c between commit 67435319866f ("staging:
pohmelfs: remove drivers/staging/pohmelfs") from Linus' tree and commit
044ff9e29029 ("switch open-coded instances of d_make_root() to new
helper") from the vfs tree.
The former just removes this file, so I did that.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpwH_SoJDeEJ.pgp
Description: PGP signature
