On 30/01/2019 12:29, Jeff Hostetler wrote: > > > On 1/26/2019 4:07 PM, Ramsay Jones wrote: >> >> Signed-off-by: Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxxx> >> --- >> >> Hi Jeff, >> >> If you need to re-roll your 'jh/trace2' branch, could you please >> squash this into the relevant patches (sorry, I didn't look to >> see which patches need to be modified). > > Will do. Thanks. > > BTW, how do you find these? I ran both "make sparse" and > "make DEVELOPER=1" and it didn't complain about these items. Carlo already replied about 'make hdr-check', but you seem to have missed squashing half of the original patch, since the re-rolled series still causes 'make -k hdr-check >phcout 2>&1' to show: $ diff nhcout phcout 22a23,34 > HDR trace2/tr2_dst.h > HDR trace2/tr2_cfg.h > HDR trace2/tr2_tgt.h > HDR trace2/tr2_cmd_name.h > HDR trace2/tr2_sid.h > HDR trace2/tr2_tls.h > trace2/tr2_tls.h:12:16: error: field ‘thread_name’ has incomplete type > struct strbuf thread_name; > ^~~~~~~~~~~ > Makefile:2739: recipe for target 'trace2/tr2_tls.hco' failed > make: *** [trace2/tr2_tls.hco] Error 1 > HDR trace2/tr2_tbuf.h 131c143 < Makefile:2725: recipe for target 'sha256/gcrypt.hco' failed --- > Makefile:2739: recipe for target 'sha256/gcrypt.hco' failed 164a177 > HDR trace2.h $ So, quoting the last part of the original patch: diff --git a/trace2/tr2_tls.h b/trace2/tr2_tls.h index 99ea9018ce..bb80e3f8e7 100644 --- a/trace2/tr2_tls.h +++ b/trace2/tr2_tls.h @@ -1,6 +1,8 @@ #ifndef TR2_TLS_H #define TR2_TLS_H +#include "strbuf.h" + /* * Arbitry limit for thread names for column alignment. */ -- ATB, Ramsay Jones
