linux-kernel - Re: [PATCH] Use the environment variable PYTHON if defined

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <5f5948dd-2c38-4ed3-8544-99c137204d07-mfwitten@gmail.com>
Date:	Sat, 9 Apr 2011 01:24:57 +0000
From:	Michael Witten <mfwitten@...il.com>
To:	Raghavendra D Prabhu <rprabhu@...hang.net>
Cc:	Arnaldo Carvalho de Melo <acme@...stprotocols.net>,
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH] Use the environment variable PYTHON if defined

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/