Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/nfs/nfs4proc.c
between commit:
d9dfd8d74168 ("NFSv4: Fix a dentry leak on alias use")
from Linus' tree and commit:
7635e19a39f6 ("replace d_add_unique() with saner primitive")
from the vfs tree.
I fixed it up (I just used the vfs tree version - thanks for the heads
up) and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
