On Thu, Jan 22, 2015 at 03:06:18PM -0500, J. Bruce Fields wrote: > By the way, Jeff, do you consider the lock changes are ready? Would you > mind if I pulled or cherry-picked them into the nfsd tree just to > simplify merging this stuff for 3.20? (Assuming it's going to be > ready.) I did the rebase because he mentioned he wanted to get it into 3.20. Note that the conflicts were fairly trivial, so it's something we could just ignore and let Linus handle the merge in the worst case. _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs
