The PR come from Juha:
https://github.com/apache/incubator-nuttx/pull/892

Juha's PR looks clean to me.

But this PR just change the code under libs/libc/netdb, I don't know
why the commit log show:
arch/mips/src/pic32mz/pic32mz_oneshot-lowerhalf.c is deleted
arch/mips/src/pic32mz/pic32mz_oneshot_lowerhalf.c is modified

Those were from commits from Abdelatif from yesterday.  This merge seems to have bought in the duplicate PRs, not Juhas PR:

   commit 434086ff935a760d274518d79d2abcf99294fc6f (HEAD -> master,
   origin/master, origin/HEAD)
   Merge: 2bfc03f636 ac55fab44d
   Author: Xiang Xiao <xiaoxi...@xiaomi.com>
   Date:   Mon Apr 27 21:39:25 2020 +0800

        Merge branch 'master' of github.com:apache/incubator-nuttx into
   openamp

The comment says that it is merging onto an openamp branch.  You have an openamp branch, but no one else does.


Reply via email to