Re: [BUG] perf: perf_output_sample() merge issue?

From: Peter Zijlstra
Date: Wed Jun 13 2012 - 09:04:41 EST


On Wed, 2012-06-13 at 14:51 +0200, Stephane Eranian wrote:
> I think the intent of this commit was to add the watermark check
> at the very end of the perf_output_sample() and NOT between processing
> of RAW and BRANCH_STACK. Something may have gone wrong
> in the merge.
>
> Can you confirm this?

Yes very much so, good spotting. Weird stuff this merging.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/