From: Christian Borntraeger <borntraeger@de.ibm.com>
To: Paolo Bonzini <pbonzini@redhat.com>,
linux-kernel@vger.kernel.org, torvalds@linux-foundation.org
Cc: gleb@kernel.org, kvm@vger.kernel.org
Subject: Re: [GIT PULL] KVM changes for 3.15 merge window
Date: Wed, 02 Apr 2014 13:06:32 +0200 [thread overview]
Message-ID: <533BEF38.50301@de.ibm.com> (raw)
In-Reply-To: <533938AE.5060709@redhat.com>
On 31/03/14 11:43, Paolo Bonzini wrote:
> Il 31/03/2014 10:30, Paolo Bonzini ha scritto:
>> Linus,
>>
>> The following changes since commit 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2:
>>
>> Linux 3.14-rc3 (2014-02-16 13:30:25 -0800)
>>
>> are available in the git repository at:
>>
>> git://git.kernel.org/pub/scm/virt/kvm/kvm.git tags/kvm-3.15-1
>
> Also at tags/for-linus, but request-pull chose this other tag for some reason.
>
> Paolo
>
>> for you to fetch changes up to 7227fc0666606b0df2c0d2966a7f4859b01bdf74:
>>
>> Merge branch 'kvm-ppchv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-next (2014-03-29 15:44:05 +0100)
>>
>> No other changes expected for this merge window.
Linus, fyi, this will cause a merge conflict in arch/s390/include/asm/kvm_host.h
Fixup looks like
__u32 fac; /* 0x01a0 */
__u8 reserved1a4[20]; /* 0x01a4 */
__u64 cbrlo; /* 0x01b8 */
__u8 reserved1c0[30]; /* 0x01c0 */
__u64 pp; /* 0x01de */
__u8 reserved1e6[2]; /* 0x01e6 */
__u64 itdba; /* 0x01e8 */
__u8 reserved1f0[16]; /* 0x01f0 */
see
https://git.kernel.org/cgit/linux/kernel/git/next/linux-next-history.git/commit/arch/s390/include/asm/kvm_host.h?id=9f6b9558157c2670410827d2ca969bb7a325a8ec
Christian
prev parent reply other threads:[~2014-04-02 11:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-31 8:30 [GIT PULL] KVM changes for 3.15 merge window Paolo Bonzini
2014-03-31 9:43 ` Paolo Bonzini
2014-04-02 11:06 ` Christian Borntraeger [this message]
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=533BEF38.50301@de.ibm.com \
--to=borntraeger@de.ibm.com \
--cc=gleb@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=torvalds@linux-foundation.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.