07.05.2014 21:03, Michael Tokarev wrote:
> Another pull request for trivial patches. It is the same as previous
> (2014-05-05) but without the problematic Makefile patch.
>
> So I'm not resending all the individual patches, as they're the same.
On change actually appeared.
I had to resolve a trivial conflict in
arch_init: Be sure of only one exit entry with DPRINTF() for ram_load()
This happens after this commit:
commit 21a246a43b606ee833f907d589d8dcbb54a2761e
Author: ChenLiang <chenlian...@huawei.com>
Date: Fri Apr 25 17:06:20 2014 +0800
migration: remove duplicate code
version_id is checked twice in the ram_load.
> Thanks,
>
> /mjt
