On Thu, 27 Jun 2013, Matt W. Benjamin wrote: > Just to confirm what Adam and I are doing on this end, ie, this is our plan to rebase wip-libcephfs following wip-libcephfs-rebase. > > * proceeding commit-wise on wip-libcephfs-rebase, mapping each change back to a commit in wip-libcephfs I wouldn't worry about referencing the original commits unless it is important to you guys (it isn't to me). Those commits won't appear in the canonical ceph.git source tree anyway. > ** striking out anything marked reject in rebase > ** striking out anything marked "whitespace" > *** (unless you want these) We can keep the whitespace fixes, as long as they are in spearate patches from real changes > ** either striking out or motivating in commit message anything marked "why" > ** updating commit messages of every commit which remains > *** with author, signed off by, SHAs of the source commit(s), updated commit message (background authors) > * test, fix, and rebase as necessary > * cherry-pick changes from Ilya > ** adapt anything we propose to adjust in new commits > * rebase on head > * push to our Ceph repo for review/pull when ready Sounds good! sage -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html