Messages in this thread |  | | Date | Wed, 6 Feb 2013 13:01:37 +0000 | From | James Hogan <> | 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
[unhandled content-type:application/pgp-signature] |  |