From: Paolo Bonzini <pbonzini@redhat.com>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: Matt Fleming <matt@codeblueprint.co.uk>,
linux-kernel@vger.kernel.org, stable@vger.kernel.org
Subject: Re: KVM patches applied in weird order in -stable
Date: Tue, 13 Sep 2016 18:58:40 +0200 [thread overview]
Message-ID: <b387a269-642f-4944-e08e-c74e00372240@redhat.com> (raw)
In-Reply-To: <20160913165704.GA27570@kroah.com>
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.
Paolo
next prev parent reply other threads:[~2016-09-13 16:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-13 14:51 Matt Fleming
2016-09-13 14:58 ` Greg KH
2016-09-13 16:26 ` Paolo Bonzini
2016-09-13 16:57 ` Greg KH
2016-09-13 16:58 ` Paolo Bonzini [this message]
2016-09-14 1:19 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b387a269-642f-4944-e08e-c74e00372240@redhat.com \
--to=pbonzini@redhat.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matt@codeblueprint.co.uk \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome