Okay, Alex and I chatted and here is the new plan for ceph-client.git: master -- tested, reviewed, "stable." won't be rebased without warning. testing -- integration branch. used by nightly qa runs. rebased often. and for-linus -- for Linus. That is all! :) sage > I pulled Chris's btrfs for-linus branch into ceph-client.git master for > the benefit of our qa runs (which use the same kernel on the client and > server side). This makes the master even more of a mess than it already > was. > > Alex, what do you think? Right now the branches are roughly: > > for-next -- tested and reviewed, for next window > master -- lightly tested. this is what qa runs against. > for-linus -- for linus to pull now.. either for -rc or current window. > > We could make master the reviewed+tested branch, and do a 'testing' > branch for the free-for-all, so that it's clearer to people that it's > untested, likely to be rebased, etc. > > 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 > > -- 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