Hi all,

On Tue, Mar 30, 2021 at 1:12 AM Chris Johns <chr...@rtems.org> wrote:
>
> On 30/3/21 6:08 pm, Till Straumann wrote:
> > None of these additions to libbsd.py -- except for mv643xx_nexus.c
> > are in my patches. Note, however, that my pull-request is on top of
> > another branch (on request/suggestion by Heinz Junkes): 
> > 'RTEMS:5-freebsd-12'.
>
> Thanks, that is what I thought. I think something has happened to the patches 
> in
> the process of getting them posted.
Yes, I rebased it to master branch before sending it, I think that
caused some issues. Sorry for the confusion, this rebased patch has
merge conflicts with the 5-freebsd-12 branch. I have tested the
original set of patches from the PR and there is no merge conflict
with the original patches on 5-freebsd-12 branch.


Best regards,
Vijay
>
> Chris
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Reply via email to