On Tue, 2023-02-14 at 15:44 -0800, Stefano Stabellini wrote:
> > Something weird has happened here -- I'm getting merge conflicts
> > in files in migration/ and in tests/unit/test-xbzrle.c, even though
> > your pullreq diffstat says it doesn't touch those files. Can you
> > try a rebase and resend?
On Tue, 14 Feb 2023, Peter Maydell wrote:
> On Mon, 13 Feb 2023 at 22:34, Stefano Stabellini
> wrote:
> >
> > On Mon, 13 Feb 2023, Peter Maydell wrote:
> > > On Fri, 10 Feb 2023 at 22:27, Stefano Stabellini
> > > wrote:
> > > >
> > > > The following changes since commit
> > > > 90595cc9396bb91
On Mon, 13 Feb 2023 at 22:34, Stefano Stabellini wrote:
>
> On Mon, 13 Feb 2023, Peter Maydell wrote:
> > On Fri, 10 Feb 2023 at 22:27, Stefano Stabellini
> > wrote:
> > >
> > > The following changes since commit
> > > 90595cc9396bb910b148391fea2e78dd8c6c8b27:
> > >
> > > Merge tag 'migration
On Mon, 13 Feb 2023, Peter Maydell wrote:
> On Fri, 10 Feb 2023 at 22:27, Stefano Stabellini
> wrote:
> >
> > The following changes since commit 90595cc9396bb910b148391fea2e78dd8c6c8b27:
> >
> > Merge tag 'migration-20230209-pull-request' of
> > https://gitlab.com/juan.quintela/qemu into stagi
On Fri, 10 Feb 2023 at 22:27, Stefano Stabellini wrote:
>
> The following changes since commit 90595cc9396bb910b148391fea2e78dd8c6c8b27:
>
> Merge tag 'migration-20230209-pull-request' of
> https://gitlab.com/juan.quintela/qemu into staging (2023-02-10 10:50:21 +)
>
> are available in the G
The following changes since commit 90595cc9396bb910b148391fea2e78dd8c6c8b27:
Merge tag 'migration-20230209-pull-request' of
https://gitlab.com/juan.quintela/qemu into staging (2023-02-10 10:50:21 +)
are available in the Git repository at:
https://gitlab.com/sstabellini/qemu.git xenpvh
