So however you got a merge conflict. Your tree wasn't up to date.
I do not encounter any merge conflicts, is just that the branches is
not
merging. By checking my build, I notice that the valleyisland-io-1.0
branch has the same HEAD of standard/base (which means I don't see any
On 14-05-23 06:48 AM, Ong, Boon Leong wrote:
So however you got a merge conflict. Your tree wasn't up to date.
I do not encounter any merge conflicts, is just that the branches is
not
merging. By checking my build, I notice that the valleyisland-io-1.0
branch has the same HEAD of
SRCREV_machine ?= f53a6114b3a6e8c03ca4752de829887015f4c942
And retry ?
Retry on the new commit and git describe valleyisland-io-1.0 shows
v3.10.38-2618-g8ea4fb6.
Perfect! *Sherlock Holmes's* style of solving linux-yocto branch merge
mystery.
We are good now!
Thanks a bunch Bruce!
--
On 14-05-23 09:26 AM, Ong, Boon Leong wrote:
SRCREV_machine ?= f53a6114b3a6e8c03ca4752de829887015f4c942
And retry ?
Retry on the new commit and git describe valleyisland-io-1.0 shows
v3.10.38-2618-g8ea4fb6.
Perfect! *Sherlock Holmes's* style of solving linux-yocto branch merge
mystery.
We
On 14-05-23 02:41 AM, Kevin Hao wrote:
The default watchdog behaviour is to stop the timer if the process
managing it closes the file /dev/watchdog. The system would not reboot
if watchdog daemon crashes due to a bug in it or get killed by other
malicious code. So we prefer to enable nowayout
