2012/1/10 Lluís Vilanova <vilan...@ac.upc.edu>: > Harsh Prateek Bora writes: > >> Signed-off-by: Harsh Prateek Bora <ha...@linux.vnet.ibm.com> >> --- >> Makefile.objs | 6 +- >> Makefile.target | 10 +- >> configure | 7 +- >> scripts/tracetool | 643 >> -------------------------------------------------- >> scripts/tracetool.py | 585 +++++++++++++++++++++++++++++++++++++++++++++ >> 5 files changed, 597 insertions(+), 654 deletions(-) >> delete mode 100755 scripts/tracetool >> create mode 100755 scripts/tracetool.py > > Cannot be applied on top of Stefan's tracing branch (AFAIK, it has only one > commit pending merge into upstream). > > Stefan, are you waiting for more patches to accumulate before merging your > branch, or is it just waiting for a prediodical merge?
Both. I should have sent a pull request for the single commit but forgot. Now I'm going to wait for the simpletrace v2 patches before I send the next pull request. Stefan
