On Mon, Feb 02, 2015 at 03:56:19PM +0100, Christoph Hellwig wrote: > On Mon, Feb 02, 2015 at 09:28:32AM -0500, J. Bruce Fields wrote: > > I didn't notice anything that looked like a big problem to me, so absent > > any objections I'll commit the revised versions for 3.20 once we figure > > out how to handle the xfs stuff. > > Do you want the resend to be on top of Jeffs locks tree, or do you > want me to be based just on the nfsd changes, which would require > a fairly trivial merge once both of the trees hit mainline? I'm planning to pull Jeff's tree and then apply these on top. (Even if the conflict's fairly trivial I'm just happier being able to test the combination exactly as they're commited.) I'll do that now, should be pushed out in an hour or two. --b. _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs
