On Mon, Mar 12, 2012 at 11:49:21AM -0400, J. Bruce Fields wrote: > On Mon, Mar 12, 2012 at 11:09:12AM -0400, Ted Ts'o wrote: > > On Fri, Mar 09, 2012 at 03:51:48PM -0500, Ted Ts'o wrote: > > > > > > Linus in general doesn't like cross tree merges (or any extraneous > > > merges) unless they are absolutely necessary; but then, he trusts git > > > merges more than many of us do. :-) > > > > > > I've put the the patch series on a separate patch, with a signed tag, at: > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git nfs-ext4-premerge > > > > > > Can you confirm that you've pulled it into your tree and it's landed > > > in linux-next? I probably won't bother pulling it in mine unless > > > there is definitely a merge conflict that I need to resolve. (I've > > > checked and there do not appear to be any against linux-next as of > > > last night.) > > > > Ping? > > Whoops, sorry. > > Looks perfect, thanks for handling these! > > I'm running them through my usual regression tests Urgh, I'm seeing a failure on the telldir test (part of the "special" connectathon tests). I haven't looked at what it's trying to do yet. Reproduceable even just on a local filesystem without NFS involved. If someone wants to look at it, you can just do: git clone git://linux-nfs.org/~bfields/cthon04.git cd cthon04 make NFS_TESTDIR=/somewhere_on_an_ext4_fs/TMP ./runtests -s (Or after running that, more specifically, cd /somewhere_on_an_ext4_fs/TMP/ ./telldir ) I'll look at it tomorrow. --b. -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
