On Wed, Jul 08, 2015 at 04:29:49PM +0300, Emil Condrea wrote: > On Mon, Jul 6, 2015 at 6:11 PM, Stefan Hajnoczi <stefa...@gmail.com> wrote: > > > On Sun, Jul 5, 2015 at 7:15 AM, Emil Condrea <emilcond...@gmail.com> > > wrote: > > > Stefan, do you know if this patch was applied? > > > > It hasn't been applied, sorry. It slipped through the cracks because > > it touches a lot of files so I thought a maintainer reviewing it after > > me would merge it. > > > > Please rebase it on Wednesday and I can take it through my block-next tree. > > > I am not sure if by "rebase" you ask me to resend the patch or just to > wait.
Rebase means move your commits on top of the latest head: $ git fetch origin $ git rebase -i origin/master If there are any conflicts it will prompt you to resolve them. This can happen because qemu.git/master has changed since you wrote these patches. You should also recompile and check that no new instances get_ticks_per_sec() have been introduced. This ensures that your patch still does the job it was intended to do, but on the latest qemu.git/master. Stefan
pgpb_4d2hIAZ7.pgp
Description: PGP signature
