From: Christian Borntraeger <borntraeger@de.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Cornelia Huck <cornelia.huck@de.ibm.com>,
Marcelo Tosatti <mtosatti@redhat.com>,
Gleb Natapov <gleb@kernel.org>,
kvm@vger.kernel.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
David Hildenbrand <dahi@linux.vnet.ibm.com>
Subject: Re: linux-next: manual merge of the kvms390 tree with the kvm tree
Date: Fri, 20 Nov 2015 11:01:20 +0100 [thread overview]
Message-ID: <564EEF70.5020205@de.ibm.com> (raw)
In-Reply-To: <20151120124717.4179e98b@canb.auug.org.au>
On 11/20/2015 02:47 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvms390 tree got a conflict in:
>
> include/linux/kvm_host.h
> arch/s390/kvm/interrupt.c
> arch/s390/kvm/sigp.c
>
> between commits:
>
> db27a7a37aa0 ("KVM: Provide function for VCPU lookup by id")
> b85de33a1a34 ("KVM: s390: avoid memory overwrites on emergency signal injection")
> 152e9f65d66f ("KVM: s390: fix wrong lookup of VCPUs by array index")
>
> from the kvm tree and commit:
>
> a8ab7a5fd13b ("KVM: Provide function for VCPU lookup by id")
> e896d1d08efc ("KVM: s390: avoid memory overwrites on emergency signal injection")
> 32d7bd98e799 ("KVM: s390: fix wrong lookup of VCPUs by array index")
>
> from the kvms390 tree.
>
> These patches used different names for the added function. I used the
> name from the kvm tree (kvm_get_vcpu_by_id).
Yes, correct.
> This should probably all be cleaned up in the kvms390 tree.
Absolutely. Sorry for the hazzle. I had fixed that up but forgot to
push out. Should be fixed now.
Christian
next prev parent reply other threads:[~2015-11-20 10:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-20 1:47 linux-next: manual merge of the kvms390 tree with the kvm tree Stephen Rothwell
2015-11-20 10:01 ` Christian Borntraeger [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-07-13 4:50 Stephen Rothwell
2020-07-15 16:25 ` Collin Walling
2020-07-15 16:59 ` Christian Borntraeger
2015-04-07 8:41 Stephen Rothwell
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=564EEF70.5020205@de.ibm.com \
--to=borntraeger@de.ibm.com \
--cc=cornelia.huck@de.ibm.com \
--cc=dahi@linux.vnet.ibm.com \
--cc=gleb@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mtosatti@redhat.com \
--cc=sfr@canb.auug.org.au \
/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