On 3 June 2015 at 13:05, Juan Quintela <quint...@redhat.com> wrote: > Hi > > Here are the pull request, it includes: > - generic patches form postcopy that are reviewed (dave) > - generic patches form RDMA fixes that are reviewed (dave) > - patches form optional section reviewed (me) > - patches for migration events reviewed (me) > - fix RDMA and ipv6 (Padmanabh) > - Remove extra variable (zhanghailiang) > > Please, apply. > > Later, Juan. > > > The following changes since commit 42d58e7c6760cb9c55627c28ae538e27dcf2f144: > > Merge remote-tracking branch 'remotes/sstabellini/tags/xen-15-06-02-tag' > into staging (2015-06-02 16:47:31 +0100) > > are available in the git repository at: > > git://github.com/juanquintela/qemu.git tags/migration/20150603-1 > > for you to fetch changes up to 6aafed47e8b7eefb0f06b2c3d05d12a1065d2a7d: > > Remove unneeded memset (2015-06-03 13:58:51 +0200) > > ---------------------------------------------------------------- > migration/next for 20150603 >
Big conflict in arch_init.c which I couldn't figure out -- could you rebase, please? thanks -- PMM
