Hi Sage, On Thu, 7 Jan 2010 20:51:45 -0800 (PST) Sage Weil <sage@xxxxxxxxxxxx> wrote: > > Okay. I can move it to my tree as well, where I assume it'll need to be > when it comes time to merge. Well, that depends on the order that the two trees get merged into Linus' tree. If you get in first, then Trond will have to fix up his tree before merging (or get Linus to apply my patch as a merge fixup). One possible thing you could do is to apply both the nfs tree patch and my patch to your tree (or merge the nfs tree into your tree and apply the merge fixup), but that will cause a problem if the patch is updated in the nfs tree (or the nfs tree rebases) ... So the easiest thing (at leas at this early stage of the development cycle) is for me to keep applying the merge fixup to my tree when I merge the later of your two trees into linux-next (this is an automated process). Maybe in a few weeks we might do something different. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpd7cq0iu2V4.pgp
Description: PGP signature
