[ptp-dev] Large commit incoming

[Greg Watson <g.watson@xxxxxxxxxxxx>]

Folks,

I'm planning to commit the new RM code tonight. Rather than try to merge it into head, I'm going to (effectively) replace master with my branch. I've been merging master into my branch, so any changes you've made will not be lost.

The process will be:

git checkout splitRM
git merge -s ours master
git checkout master
git merge splitRM

There are still a few issues that need to be resolved, but I'll try to get as many of these in before 5/8. Also, I have not tested ETFw with the new framework, although it has been modified to use it. I'm relying on ETFw aficionados to let me know if there are any problems.

Regards,
Greg