There was a branching snafu a couple days back (the next/emperor branch got all of master merged in after -rc1) that was most sanely cleaned up by rebuilding the branches from that point. Fortunately not too much has gone in since then, so it wasn't too much.
HOWEVER, if you work based on master or next since then, take a careful look at gitk and make sure your work is rebased on top of the *new* master and next. FYI that is usually done with: git checkout wip-foo git rebase --onto origin/next HEAD^ git push origin -f wip-foo where HEAD^ can be replaced with whatever commit your work is based off of. (HEAD^ works for a single-patch branch.) I updated several branches already.. hopefully all of them in ceph.git. Those include wip-6699 wip-crush-location-doc wip-perf2 wip-pipe wip-warnings Also, going forward, be careful to look at the commits and/or diff in pull requests before merging to make sure we're not picking bits of the old branches. Thanks! Sorry for the confusion! sage -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
