From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424784AbcFHKZa (ORCPT ); Wed, 8 Jun 2016 06:25:30 -0400 Received: from mx6-phx2.redhat.com ([209.132.183.39]:39368 "EHLO mx6-phx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423210AbcFHKZ1 convert rfc822-to-8bit (ORCPT ); Wed, 8 Jun 2016 06:25:27 -0400 Date: Wed, 8 Jun 2016 06:25:20 -0400 (EDT) From: Paolo Bonzini To: Stephen Rothwell Cc: Heiko Carstens , Christian Borntraeger , Sudip Mukherjee , Cornelia Huck , Radim =?utf-8?B?S3LEjW3DocWZ?= , Martin Schwidefsky , linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, kvm@vger.kernel.org Message-ID: <1162621005.20783715.1465381520818.JavaMail.zimbra@redhat.com> In-Reply-To: <20160608180917.4d6d3434@canb.auug.org.au> References: <1465336170-23064-1-git-send-email-sudipm.mukherjee@gmail.com> <5757AA6F.705@de.ibm.com> <20160608053129.GA3311@osiris> <20160608180917.4d6d3434@canb.auug.org.au> Subject: Re: [PATCH] KVM: s390: fix build failure MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT X-Originating-IP: [10.4.164.1, 10.5.100.50] X-Mailer: Zimbra 8.0.6_GA_5922 (ZimbraWebClient - FF46 (Linux)/8.0.6_GA_5922) Thread-Topic: s390: fix build failure Thread-Index: fdQ/2xqIXdGsQm2vdW0XckOjnuGwMw== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ----- Original Message ----- > From: "Stephen Rothwell" > To: "Heiko Carstens" > Cc: "Christian Borntraeger" , "Sudip Mukherjee" , "Cornelia Huck" > , "Paolo Bonzini" , "Radim Krčmář" , "Martin > Schwidefsky" , linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, kvm@vger.kernel.org > Sent: Wednesday, June 8, 2016 10:09:17 AM > Subject: Re: [PATCH] KVM: s390: fix build failure > > Hi Heiko, > > On Wed, 8 Jun 2016 07:31:29 +0200 Heiko Carstens > wrote: > > > > On Wed, Jun 08, 2016 at 07:17:35AM +0200, Christian Borntraeger wrote: > > > On 06/07/2016 11:49 PM, Sudip Mukherjee wrote: > > > > etr_ptff definitions are moved and renamed but we missed updating them > > > > here and as a result s390 defconfig and allmodconfig was failing with > > > > the error: > > > > arch/s390/kvm/kvm-s390.c:230:45: error: 'ETR_PTFF_QAF' undeclared > > > > > > > > Fixes: cc8f94656487 ("s390/time: move PTFF definitions") > > > > Signed-off-by: Sudip Mukherjee > > > > > > Thank you for the report and patch. > > > > > > This is linux-next only. Its a conflict between my kvms390 queue and > > > Martins s390 queue. We cannot apply this directly as it would break > > > the build of my tree when not merged in next. (and it does not apply > > > on Martins tree). > > > > > > I will have a look how to fix that up. > > > > We could ask Stephen Rothwell to apply the patch only to linux-next? ;) > > Martin sent me the same patch earlier and I applied it to the merge of > the kvms390 tree today. Someone needs to remember to tell Linus when > the time comes. I can take care of that. On your side, the resolution will have to migrate to the KVM tree as soon as Christian sends me a pull request for 4.8. Thanks, Paolo