Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753264Ab2FMNEe (ORCPT ); Wed, 13 Jun 2012 09:04:34 -0400 Received: from merlin.infradead.org ([205.233.59.134]:54607 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750987Ab2FMNEd convert rfc822-to-8bit (ORCPT ); Wed, 13 Jun 2012 09:04:33 -0400 Message-ID: <1339592667.8980.32.camel@twins> Subject: Re: [BUG] perf: perf_output_sample() merge issue? From: Peter Zijlstra To: Stephane Eranian Cc: LKML , mingo@elte.hu Date: Wed, 13 Jun 2012 15:04:27 +0200 In-Reply-To: References: Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7BIT X-Mailer: Evolution 3.2.2- Mime-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 605 Lines: 14 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/