| Message ID | 20191125005826.GA25463@oak.ozlabs.ibm.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [GIT,PULL] Please pull my kvm-ppc-next-5.5-2 tag | expand |
On 25/11/19 01:58, Paul Mackerras wrote: > Paolo, > > Please do a pull from my kvm-ppc-next-5.5-2 tag to get two more > commits which should go upstream for 5.5. Although they are in my > kvm-ppc-next branch, they are actually bug fixes, fixing host memory > leaks in the XIVE interrupt controller code, so they should be fine to > go into v5.5 even though the merge window is now open. > > Thanks, > Paul. Yes, of course (I have even accepted submaintainer pull request for new features during the first week of the merge window, so not a problem at all). I'll send my pull request to Linus shortly. Paolo
On Mon, Nov 25, 2019 at 11:29:38AM +0100, Paolo Bonzini wrote: > On 25/11/19 01:58, Paul Mackerras wrote: > > Yes, of course (I have even accepted submaintainer pull request for new > features during the first week of the merge window, so not a problem at > all). In that case, I have a patchset from Bharata Rao which is just now ready to go in. It has been around for a while; Bharata posted v11 yesterday, and we would really like it to go in v5.5, but I thought we were too late. If you're OK with taking it at this stage then I'll send you another pull request. Thanks, Paul.
On 26/11/19 00:44, Paul Mackerras wrote: >> Yes, of course (I have even accepted submaintainer pull request for new >> features during the first week of the merge window, so not a problem at >> all). > In that case, I have a patchset from Bharata Rao which is just now > ready to go in. It has been around for a while; Bharata posted v11 > yesterday, and we would really like it to go in v5.5, but I thought we > were too late. If you're OK with taking it at this stage then I'll > send you another pull request. Yes, it's fine. Paolo
Paolo, Please do a pull from my kvm-ppc-next-5.5-2 tag to get two more commits which should go upstream for 5.5. Although they are in my kvm-ppc-next branch, they are actually bug fixes, fixing host memory leaks in the XIVE interrupt controller code, so they should be fine to go into v5.5 even though the merge window is now open. Thanks, Paul. The following changes since commit 55d7004299eb917767761f01a208d50afad4f535: KVM: PPC: Book3S HV: Reject mflags=2 (LPCR[AIL]=2) ADDR_TRANS_MODE mode (2019-10-22 16:29:02 +1100) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc tags/kvm-ppc-next-5.5-2 for you to fetch changes up to 30486e72093ea2e594f44876b7a445c219449bce: KVM: PPC: Book3S HV: XIVE: Fix potential page leak on error path (2019-11-21 16:24:41 +1100) ---------------------------------------------------------------- Second KVM PPC update for 5.5 - Two fixes from Greg Kurz to fix memory leak bugs in the XIVE code. ---------------------------------------------------------------- Greg Kurz (2): KVM: PPC: Book3S HV: XIVE: Free previous EQ page when setting up a new one KVM: PPC: Book3S HV: XIVE: Fix potential page leak on error path arch/powerpc/kvm/book3s_xive_native.c | 44 +++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 15 deletions(-)