[oe] [PATCH] sg3-utils: get 1.24 to cross compile
Koen Kooi
k.kooi at student.utwente.nl
Wed Feb 4 08:00:45 UTC 2009
On 04-02-09 07:45, Hans Henry von Tresckow wrote:
> Please review this patch and push if OK
>
> -<<<<<<< HEAD:packages/sg3-utils/sg3-utils_1.24.bb
>
> -=======
> ->>>>>>> c92bef17d2a35e06ec6edc2439918c88a7b4808b:packages/sg3-utils/sg3-utils_1.24.bb
This highlights one of the braindead things of git: it leave inline
conflict markers in your code without telling you, breaking things left
and right.
Anyway... those conflict markers aren't in OE, so please generate your
patch against a clean tree.
regards,
Koen
More information about the Openembedded-devel
mailing list