Am 11.11.2015 um 16:42 hat Stefan Hajnoczi geschrieben: > On Wed, Nov 11, 2015 at 11:25 AM, Peter Maydell > <peter.mayd...@linaro.org> wrote: > > On 10 November 2015 at 15:06, Stefan Hajnoczi <stefa...@redhat.com> wrote: > >> v2: > >> * Rebase onto Kevin's block pull request > >> > >> The following changes since commit > >> c400bddb916268394e352f82809eb4728424a5b1: > >> > >> Merge remote-tracking branch > >> 'mreitz/tags/pull-block-for-kevin-2015-11-10' into queue-block (2015-11-10 > >> 14:59:26 +0100) > >> > >> are available in the git repository at: > >> > >> git://github.com/stefanha/qemu.git tags/block-pull-request > >> > >> for you to fetch changes up to 7651e1c68acdaf60954668540c9df778397631d6: > >> > >> block: Update copyright of the accounting code (2015-11-10 14:48:26 > >> +0000) > >> > >> ---------------------------------------------------------------- > > > > I'm assuming you'll need to re-rebase this when Kevin sends out a > > fixed version of his pullreq; please send another mail when you do > > that (ie I am dropping this from my list of things to process). > > I'm currently travelling and will be offline until Friday. > > Maybe Kevin can rebase this pull request onto his fixed one? It > shouldn't be a huge job (this v2 was pretty easy to rebase onto > Kevin's v1 pull request).
I would assume that there are no merge conflicts, but if a rebase is necessary, I can do that as soon as my pull request makes it through. Kevin
