On Wed, Jul 24, 2019 at 02:53:23PM +0200, Erik Skultety wrote: > On Fri, Jul 12, 2019 at 07:55:35AM +0200, Ilias Stamatis wrote: > > Signed-off-by: Ilias Stamatis <stamatis.iliass@xxxxxxxxx> > > --- > > This patch cannot be applied, was it formatted from a different branch? I only > applied the diff, built and reviewed. Like I said in the other series, I could > fix it, but I'd be forging a patch with your SoB, so you can resend with the > change in 1/3. So, I don't know how exactly these patches were created, but git complains that the ancestor is invalid and refuses to apply the patch, even though the diff itself can be applied cleanly. Resetting the branch prior to any of your test driver patches I already merged, re-applying and then rebasing on top of the current master works like a charm. I'd prefer if 'git am -3' didn't complain if it can apply the patch without conflicts. Anyhow, consider this resolved, no need to resend. Erik -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
