[meta-xilinx] trying to build core-image-zynq with yocto exposes conflicting patch files

[Robert P. J. Day]

On Mon, 1 Apr 2013, Elvis Dowson wrote:

> On Apr 1, 2013, at 20:55, "Robert P. J. Day" <rpjday at crashcourse.ca> wrote:
... snip ...
> >  ok, then i've got something screwy going on here, i'll figure out
> > what it is.
>
> Just remove the conflict diff entries in the meta-zynq layer to proceed! :-)

 oh, i know how to fix this, i'm just not sure how i got into the
confused, repo-related state i see before me.  more in a bit once i
clean this up. grrrr ...

rday

-- 

========================================================================
Robert P. J. Day                                 Ottawa, Ontario, CANADA
                        http://crashcourse.ca

Twitter:                                       http://twitter.com/rpjday
LinkedIn:                               http://ca.linkedin.com/in/rpjday
========================================================================