* On Sat, Apr 09, 2011 at 01:24:57AM +0000, Michael Witten <mfwitten@gmail.com> wrote:
>On Sat, 9 Apr 2011 02:47:09 +0530, Raghavendra D Prabhu wrote:
>
>> Apologies for the delay. I am getting a merge conflict
>> with master now, it may need to be rebased after the
>> 1b7155f7de119870f0d3fad89f125de2ff6c16be commit.
>
>Erg... `git am' isn't really any help there, as it doesn't
>leave information in the files about where there are conflicts;
>I had to resort to running `git merge' by hand.
>
>Anyway, I've sent along (as replies to this email) *2* patches;
>the first one:
>
>  perf tools: Makefile: Clean up `python/perf.so' rule
>
>is just a minor tweak of the offending conflict, and the second
>one is the updated patch proper:
>
>  perf tools: Makefile: PYTHON{,_CONFIG} to bandage Python 3 incompatibility
>
>They should apply cleanly on Arnaldo's `perf/urgent' branch from
>his repository here:
>
>  git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6.git
>
>the tip of which contains the commit you mentioned:
>
>  1b7155f7de119870f0d3fad89f125de2ff6c16be
>
>Arnaldo, is it generally a good idea to branch from `perf/urgent'
>in order to keep things up to date?
>
>Sincerely,
>Michael Witten
Tested it on the perf/urgent branch. Works great. I have a question
regarding the message that is displayed. It says "No Python.h found"
when variable PYTHON is not set correctly, it would be better if it said
"No Python.h for Python 2.x found" since the header file supplied by
Py3k is also Python.h and in the rare case of only Py3k installed on the
box, it may be confusing.