On Jul 16, 2010, at 2:04 AM, Christoph Hellwig wrote:
> Given that this still hasn't been picked up in any other tree would
> people mind if we push patches 1 and 2 through the XFS tree?
> I some more changes that sit ontop of this, and it would make my
> life a lot easier.
Thanks for bringing this up. I was going to ask if you had any changes
in patch1 of this series since I was about to put them into the ext4 tree
and I didn't want to have any merge conflicts (or have to force a tree
rewind/rebase) if it turned out if there had been some changes and
some other tree landed in Linus's tree first.
In other words, since we both have patches that depend on your
first patch, one easy way of handling things is that we both put them
into our respective fs trees, and as long as the patch doesn't change
git should do the right thing when Steve or Linus merges them into their
linux-next or linus trees, respectively.
Do you have any objections with this?