Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: fs/ufs/namei.c between commit: a50e4a02ad69 "ufs: don't bother with lock_ufs()/unlock_ufs() for directory access" from the vfs tree and commit: 2ce1efe3965b "fs/ufs: revert "ufs: fix deadlocks introduced by sb mutex merge" from the akpm-current tree. I fixed it up by taking the vfs version and can carry the fix as necessary (no action is required). cheers -- 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
