On Fri, Aug 21, 2020 at 5:26 PM Peter Maydell <peter.mayd...@linaro.org> wrote:
>
> On Thu, 13 Aug 2020 at 08:44, Stefan Hajnoczi <stefa...@redhat.com> wrote:
> >
> > The following changes since commit d0ed6a69d399ae193959225cdeaa9382746c91cc:
> >
> >   Update version for v5.1.0 release (2020-08-11 17:07:03 +0100)
> >
> > are available in the Git repository at:
> >
> >   https://github.com/stefanha/qemu.git tags/tracing-pull-request
> >
> > for you to fetch changes up to bd6c9e56aba2e1b9a307642c72375386afbcf1f2:
> >
> >   trace-events: Fix attribution of trace points to source (2020-08-12 
> > 20:28:5=
> > 4 +0100)
> >
> > ----------------------------------------------------------------
> > Pull request
> >
> > macOS dtrace support and cleanups.
>
> Hi; this conflicts with the meson buildsystem merge, I'm
> afraid -- can you rebase and resend, please?

Sure, I will resend it.

Stefan

Reply via email to