From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754016AbaIOPvZ (ORCPT <rfc822;w@1wt.eu>);
	Mon, 15 Sep 2014 11:51:25 -0400
Received: from mail.kernel.org ([198.145.19.201]:36697 "EHLO mail.kernel.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753956AbaIOPvF (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 15 Sep 2014 11:51:05 -0400
Date: Mon, 15 Sep 2014 12:50:49 -0300
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Adrian Hunter <adrian.hunter@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>, linux-kernel@vger.kernel.org,
        David Ahern <dsahern@gmail.com>,
        Frederic Weisbecker <fweisbec@gmail.com>, Jiri Olsa <jolsa@redhat.com>,
        Namhyung Kim <namhyung@gmail.com>, Paul Mackerras <paulus@samba.org>,
        Stephane Eranian <eranian@google.com>
Subject: Re: [PATCH 22/24] perf tools: Build programs to copy 32-bit
 compatibility VDSOs
Message-ID: <20140915155049.GD11199@kernel.org>
References: <1408129739-17368-1-git-send-email-adrian.hunter@intel.com>
 <1408129739-17368-23-git-send-email-adrian.hunter@intel.com>
 <20140915154752.GC11199@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20140915154752.GC11199@kernel.org>
X-Url: http://acmel.wordpress.com
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Em Mon, Sep 15, 2014 at 12:47:52PM -0300, Arnaldo Carvalho de Melo escreveu:
> Em Fri, Aug 15, 2014 at 10:08:57PM +0300, Adrian Hunter escreveu:
> 
> > perf tools copy VDSO out of memory.  However, on 64-bit machines there
> > may be 32-bit compatibility VDOs also.  To copy those requires
> > separate 32-bit executables.  This patch adds to the build additional
> > programs perf-read-vdso32 and perf-read-vdsox32 for 32-bit and x32
> > respectively.
>  
> > Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
> <SNIP>
> >  tools/perf/config/feature-checks/test-compile.c |  4 +++
> <SNIP>
> >  8 files changed, 149 insertions(+), 37 deletions(-)
> <SNIP>
> >  create mode 100644 tools/perf/config/feature-checks/test-compile.c
> <SNIP>
> 
> 
> In resolving conflicts that happen because I haven't merged some other
> files (thread_stack, etC) I noticed that this patch introduces something
> that is explicitely listed in a .gitignore file:
> 
> [acme@zoo linux]$ git show d316f16dddd8c7780c727bbd507338e4147c9280
> commit d316f16dddd8c7780c727bbd507338e4147c9280
> Author: Alexander Shishkin <alexander.shishkin@linux.intel.com>
> Date:   Fri Aug 15 22:08:59 2014 +0300
> 
>     perf tools: Add feature checks to .gitignore
> 
> <SNIP>
> 
> +++ b/tools/perf/.gitignore
> @@ -24,3 +24,4 @@ config.mak.autogen
>  *-flex.*
>  *.pyc
>  *.pyo
> +config/feature-checks/test-*
> [acme@zoo linux]$
> 
> 
> So I think we should use some different name for this test-compile.c
> file?
> 
> I'll leave those two csets out of this pull req, so that you can rebase
> what is left on top of what is being merged and we can do one more
> progress step in having all this merged, ok?

Since we can't ignore all test- prefixed files there, I'm removing the
patch that added it to .gitignore as well:

commit d316f16dddd8c7780c727bbd507338e4147c9280
Author: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Date:   Fri Aug 15 22:08:59 2014 +0300

Aftewards I'll revisit this, because without this .gitignore patch I
think your patch will be ok.

- Arnaldo
 
> I mean:
> 
> >> Up-to-date versions can be found from 15 August:
> >>
> >>      patchwork:
> >>
> >>              https://patchwork.kernel.org/patch/4729131/
> >>              https://patchwork.kernel.org/patch/4729111/
> 
> 
> - Arnaldo