Re: KVM patches applied in weird order in -stable

From	Greg KH <gregkh@linuxfoundation.org>
Newsgroups	linux.kernel
Subject	Re: KVM patches applied in weird order in -stable
Date	2016-09-14 03:30 +0200
Message-ID	<sh7br-1xA-5@gated-at.bofh.it> (permalink)
References	<sgXlM-3gI-3@gated-at.bofh.it> <sgXlM-3gI-25@gated-at.bofh.it> <sgYKR-4ky-13@gated-at.bofh.it> <sgZdT-4vC-3@gated-at.bofh.it> <sgZdU-4vC-25@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Tue, Sep 13, 2016 at 06:58:40PM +0200, Paolo Bonzini wrote:
> 
> 
> On 13/09/2016 18:57, Greg KH wrote:
> >>>> > >>  [0] commit 4e422bdd2f84 ("KVM: x86: fix missed hardware breakpoints")
> >>>> > >>  [1] commit 172b2386ed16 ("KVM: x86: fix missed hardware breakpoints")
> >>>> > >>  [2] commit 70e4da7a8ff6 ("KVM: x86: fix root cause for missed hardware breakpoints")
> >>>> > >>
> >>>> > >> but this is the order for linux-4.4.y
> >>>> > >>
> >>>> > >>  [1] commit fc90441e728a ("KVM: x86: fix missed hardware breakpoints")
> >>>> > >>  [2] commit 25e8618619a5 ("KVM: x86: fix root cause for missed hardware breakpoints")
> >>>> > >>  [0] commit 0f6e5e26e68f ("KVM: x86: fix missed hardware breakpoints")
> >>>> > >>
> >>>> > >> The upshot is that KVM_DEBUGREG_RELOAD is always set when returning
> >>>> > >> from kvm_arch_vcpu_load() in stable, but not in Linus' tree.
> >>> > > 
> >>> > > How would applying these in a different order cause breakage?
> >> > 
> >> > [2] is reverting [0]+[1].  Stable is not due to the different order.
> > Really?  Are you sure that [0] and [1] isn't just the same commit?  It
> > looks like that to me.
> 
> It is; "git" automatically resolved the conflicts when merging [1], and
> then [2] reverted the change.  In stable, changing the order created a
> different conflict resolution.

Yes, given that I turn them into individual patches, the order I used
was really the only one that would work, and is how this happened :)

thanks,

greg k-h

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

KVM patches applied in weird order in -stable Matt Fleming <matt@codeblueprint.co.uk> - 2016-09-13 17:00 +0200
  Re: KVM patches applied in weird order in -stable Greg KH <gregkh@linuxfoundation.org> - 2016-09-13 17:00 +0200
    Re: KVM patches applied in weird order in -stable Paolo Bonzini <pbonzini@redhat.com> - 2016-09-13 18:30 +0200
      Re: KVM patches applied in weird order in -stable Greg KH <gregkh@linuxfoundation.org> - 2016-09-13 19:00 +0200
        Re: KVM patches applied in weird order in -stable Paolo Bonzini <pbonzini@redhat.com> - 2016-09-13 19:00 +0200
          Re: KVM patches applied in weird order in -stable Greg KH <gregkh@linuxfoundation.org> - 2016-09-14 03:30 +0200

csiph-web