linux-kernel - Re: linux-next: manual merge of the metag tree with the arc tree

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] [day] [month] [year] [list]

Message-ID: <51125431.2090300@imgtec.com>
Date:	Wed, 6 Feb 2013 13:01:37 +0000
From:	James Hogan <james.hogan@...tec.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	Vineet Gupta <vgupta@...opsys.com>
Subject: Re: linux-next: manual merge of the metag tree with the arc tree

On 06/02/13 00:03, Stephen Rothwell wrote:
> Hi James,
> 
> Today's linux-next merge of the metag tree got a conflict in
> tools/perf/perf.h between commit 12bf48ef6194 ("perf, ARC: Enable
> building perf tools for ARC") from the arc tree and commit 6c4a2bebec36
> ("perf: Enable building perf tools for Meta") from the metag tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 

Thanks, looks good to me

Cheers
James


Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)