[linuxtools-dev] lttng-agent compile failure with ust-0.12

2011-04-07 Thread Lu, Lianhao
Hi guys, I met an error in compiling the lttng-agent with ust-0.12, does anyone know with which version of ust the lttng-agent can work? Thanks! $./configure --enable-kernel=no enable-ust=yes $ make CC lttctlusttransfer.lo lttctlusttransfer.c: In function 'flush_thread': lttctlusttransfer.

[linuxtools-dev] Git Merging

2011-04-07 Thread Jeff Johnston
Recently a number of files I had pushed to our remote repository were deleted when I did a merge. What appears to have happened is that someone else performed their own merge in-between and must have removed the new files from the staging area after a conflict occurred (e.g. git reset fileX).