From: "Radim Krčmář" <rkrcmar@redhat.com>
To: Paul Mackerras <paulus@ozlabs.org>
Cc: kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>,
kvm-ppc@vger.kernel.org
Subject: Re: [GIT PULL] Please pull paulus/powerpc kvm-ppc-next-4.15-2 tag
Date: Thu, 09 Nov 2017 17:59:10 +0000 [thread overview]
Message-ID: <20171109175910.GI20859@flask> (raw)
In-Reply-To: <20171109105014.GD32509@fergus.ozlabs.ibm.com>
2017-11-09 21:50+1100, Paul Mackerras:
> Paolo or Radim,
>
> Please do a pull from the kvm-ppc-next-4.15-2 tag in my tree, because
> I have merged in my kvm-ppc-fixes branch and then done a little
> tidying up after that. The recent patch "KVM: PPC: Book3S HV: Fix
> exclusion between HPT resizing and other HPT updates" on my
> kvm-ppc-fixes branch modified code that was very substantially
> rearranged in my patch series to implement HPT guests on radix hosts
> on POWER9, so the conflict was non-trivial to resolve. There was also
> a conflict between two changes to the code for the KVM_CAP_PPC_HTM
> capability that I resolved.
Pulled, thanks.
WARNING: multiple messages have this Message-ID (diff)
From: "Radim Krčmář" <rkrcmar@redhat.com>
To: Paul Mackerras <paulus@ozlabs.org>
Cc: kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>,
kvm-ppc@vger.kernel.org
Subject: Re: [GIT PULL] Please pull paulus/powerpc kvm-ppc-next-4.15-2 tag
Date: Thu, 9 Nov 2017 18:59:10 +0100 [thread overview]
Message-ID: <20171109175910.GI20859@flask> (raw)
In-Reply-To: <20171109105014.GD32509@fergus.ozlabs.ibm.com>
2017-11-09 21:50+1100, Paul Mackerras:
> Paolo or Radim,
>
> Please do a pull from the kvm-ppc-next-4.15-2 tag in my tree, because
> I have merged in my kvm-ppc-fixes branch and then done a little
> tidying up after that. The recent patch "KVM: PPC: Book3S HV: Fix
> exclusion between HPT resizing and other HPT updates" on my
> kvm-ppc-fixes branch modified code that was very substantially
> rearranged in my patch series to implement HPT guests on radix hosts
> on POWER9, so the conflict was non-trivial to resolve. There was also
> a conflict between two changes to the code for the KVM_CAP_PPC_HTM
> capability that I resolved.
Pulled, thanks.
next prev parent reply other threads:[~2017-11-09 17:59 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-08 11:03 [GIT PULL] Please pull paulus/powerpc kvm-ppc-fixes-4.14-2 tag Paul Mackerras
2017-11-08 11:03 ` Paul Mackerras
2017-11-08 13:17 ` Paolo Bonzini
2017-11-08 13:17 ` Paolo Bonzini
2017-11-09 5:25 ` Paul Mackerras
2017-11-09 5:25 ` Paul Mackerras
2017-11-09 9:46 ` Paolo Bonzini
2017-11-09 9:46 ` Paolo Bonzini
2017-11-09 18:01 ` Radim Krčmář
2017-11-09 18:01 ` Radim Krčmář
2017-11-09 10:50 ` [GIT PULL] Please pull paulus/powerpc kvm-ppc-next-4.15-2 tag Paul Mackerras
2017-11-09 10:50 ` Paul Mackerras
2017-11-09 17:59 ` Radim Krčmář [this message]
2017-11-09 17:59 ` Radim Krčmář
2017-11-24 23:21 ` [GIT PULL] Please pull paulus/powerpc kvm-ppc-fixes-4.15-1 tag Paul Mackerras
2017-11-24 23:21 ` Paul Mackerras
2017-11-27 16:58 ` Paolo Bonzini
2017-11-27 16:58 ` Paolo Bonzini
2018-01-11 2:42 ` [GIT PULL] Please pull paulus/powerpc kvm-ppc-fixes-4.15-3 tag Paul Mackerras
2018-01-11 2:42 ` Paul Mackerras
2018-01-11 13:07 ` Paolo Bonzini
2018-01-11 13:07 ` Paolo Bonzini
2018-01-11 9:31 ` [GIT PULL] Please pull paulus/powerpc kvm-ppc-cve-4.15 tag Paul Mackerras
2018-01-11 9:31 ` Paul Mackerras
2018-01-11 10:51 ` Paolo Bonzini
2018-01-11 10:51 ` Paolo Bonzini
2018-01-11 22:15 ` Paul Mackerras
2018-01-11 22:15 ` Paul Mackerras
2018-01-12 9:28 ` Paolo Bonzini
2018-01-12 9:28 ` Paolo Bonzini
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=20171109175910.GI20859@flask \
--to=rkrcmar@redhat.com \
--cc=kvm-ppc@vger.kernel.org \
--cc=kvm@vger.kernel.org \
--cc=paulus@ozlabs.org \
--cc=pbonzini@redhat.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.