From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christian Borntraeger Subject: Re: [GIT PULL 00/18] KVM: s390: Fixes and features for kvm/next (4.6) Date: Fri, 12 Feb 2016 17:15:12 +0100 Message-ID: <56BE0510.9030601@de.ibm.com> References: <1455283382-62999-1-git-send-email-borntraeger@de.ibm.com> <56BDFF66.6080003@redhat.com> <56BE0037.6090505@de.ibm.com> <56BE01A3.4020801@redhat.com> <56BE0397.5030901@de.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <56BE0397.5030901@de.ibm.com> Sender: kvm-owner@vger.kernel.org List-Archive: List-Post: To: Paolo Bonzini Cc: KVM , linux-s390 , Cornelia Huck , Jens Freimann , Alexander Graf List-ID: On 02/12/2016 05:08 PM, Christian Borntraeger wrote: > On 02/12/2016 05:00 PM, Paolo Bonzini wrote: >> >> >> On 12/02/2016 16:54, Christian Borntraeger wrote: >>> I need one patch for 4.4 as well (vs. 3 patches against 4.5-rc3). So bisect is broken >>> on 4.4 as well, I just had it fixed earlier. >> >> If these three patches are in Linus's tree, just send the pull request >> against that. It's okay if a submaintainer pull request brings back a >> few more commits from Linus's tree. > > Not yet in Linus tree (cgroup-fixes mostly) > >> >> Rebases aren't great, but no one should be basing a linux-next tree on >> kvm-s390/next so I guess that's not too evil a thing to do. > > Yes, kvm-s390/next can certainly be rebased, right now I do not have a working > upstream commit >4.4. > > What I could do is to use my old pull request for kvm/next that was > targetted for 4.5. That tree did survive some testing, so basically rebase > against kvm-s390-next-4.5-3 ? Hmmm, nope. This has some fallout that we both have to fix as conflicts. I will simply retest the 4.5 branch with cherry-picks and thp disabled. Christian