On Thu, Jun 09, 2016 at 05:57:54PM +0100, Daniel P. Berrange wrote: > To quote Peter today: > > pm215: "trace-events: causing merge conflicts since 2010" > > There's really no good reason why we should continue > to suffer from this. Even if the trace tool generator > can't yet generate multiple independant output files, > we can still trivially have multiple independant > input files. > > This series splits up trace-events so that there is > one trace-events file per sub-directory that has > tracing events defined. This means that the trace-events > files now get assoociated with the subsystem maintainers > if you run get_maintainer.pl on a patch. It also means > that responsibility for resolving conflicts is now > delegated to subsystem maintainers, and overall such > conflicts should be much rarer. > > Finally, we will likely need this kind of split work done > when we do finally get the ability to generate multiple > output files, so it is a worthwhile thing to change now > regardless.
This looks useful, thanks. Please update docs/tracing.txt and qemu-options.hx with s/trace-events/trace-events-all/.
signature.asc
Description: PGP signature