From: Paolo Bonzini <pbonzini@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Heiko Carstens" <heiko.carstens@de.ibm.com>,
"Christian Borntraeger" <borntraeger@de.ibm.com>,
"Sudip Mukherjee" <sudipm.mukherjee@gmail.com>,
"Cornelia Huck" <cornelia.huck@de.ibm.com>,
"Radim Krčmář" <rkrcmar@redhat.com>,
"Martin Schwidefsky" <schwidefsky@de.ibm.com>,
linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org,
kvm@vger.kernel.org
Subject: Re: [PATCH] KVM: s390: fix build failure
Date: Wed, 8 Jun 2016 06:25:20 -0400 (EDT) [thread overview]
Message-ID: <1162621005.20783715.1465381520818.JavaMail.zimbra@redhat.com> (raw)
In-Reply-To: <20160608180917.4d6d3434@canb.auug.org.au>
----- Original Message -----
> From: "Stephen Rothwell" <sfr@canb.auug.org.au>
> To: "Heiko Carstens" <heiko.carstens@de.ibm.com>
> Cc: "Christian Borntraeger" <borntraeger@de.ibm.com>, "Sudip Mukherjee" <sudipm.mukherjee@gmail.com>, "Cornelia Huck"
> <cornelia.huck@de.ibm.com>, "Paolo Bonzini" <pbonzini@redhat.com>, "Radim Krčmář" <rkrcmar@redhat.com>, "Martin
> Schwidefsky" <schwidefsky@de.ibm.com>, 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 <heiko.carstens@de.ibm.com>
> 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 <sudip.mukherjee@codethink.co.uk>
> > >
> > > 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
next prev parent reply other threads:[~2016-06-08 10:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-07 21:49 [PATCH] KVM: s390: fix build failure Sudip Mukherjee
2016-06-08 5:17 ` Christian Borntraeger
2016-06-08 5:31 ` Heiko Carstens
2016-06-08 8:09 ` Stephen Rothwell
2016-06-08 10:25 ` Paolo Bonzini [this message]
2016-06-08 6:39 ` Martin Schwidefsky
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=1162621005.20783715.1465381520818.JavaMail.zimbra@redhat.com \
--to=pbonzini@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=cornelia.huck@de.ibm.com \
--cc=heiko.carstens@de.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=rkrcmar@redhat.com \
--cc=schwidefsky@de.ibm.com \
--cc=sfr@canb.auug.org.au \
--cc=sudipm.mukherjee@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).