From: Mark Brown <broonie@kernel•org>
To: Marcelo Tosatti <mtosatti@redhat•com>,
Gleb Natapov <gleb@kernel•org>,
Konstantin Weitz <konstantin.weitz@gmail•com>,
Christian Borntraeger <borntraeger@de•ibm.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the kvm tree with the tree
Date: Tue, 11 Mar 2014 20:09:14 +0000 [thread overview]
Message-ID: <20140311200914.2cf12d61480eca0044691007@kernel.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1300 bytes --]
Hi all,
Today's linux-next merge of the kvm tree got a conflict in arch/s390/include/asm/kvm_host.h between commit b31288fa83b2b ("s390/kvm: support collaborative memory management") from the tree and commit 672550fb682e993 ("KVM: s390: Provide access to program parameter") from the kvm tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
diff --cc arch/s390/include/asm/kvm_host.h
index 9bf95bb30f1a,734d302ba389..000000000000
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@@ -106,9 -107,9 +107,11 @@@ struct kvm_s390_sie_block
__u64 gbea; /* 0x0180 */
__u8 reserved188[24]; /* 0x0188 */
__u32 fac; /* 0x01a0 */
- __u8 reserved1a4[58]; /* 0x01a4 */
+ __u8 reserved1a4[20]; /* 0x01a4 */
+ __u64 cbrlo; /* 0x01b8 */
- __u8 reserved1c0[40]; /* 0x01c0 */
++ __u8 reserved1c0[30]; /* 0x01c0 */
+ __u64 pp; /* 0x01de */
+ __u8 reserved1e6[2]; /* 0x01e6 */
__u64 itdba; /* 0x01e8 */
__u8 reserved1f0[16]; /* 0x01f0 */
} __attribute__((packed));
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-03-11 20:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-11 20:09 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-03-25 2:32 linux-next: manual merge of the kvm tree with the tree 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=20140311200914.2cf12d61480eca0044691007@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=borntraeger@de$(echo .)ibm.com \
--cc=gleb@kernel$(echo .)org \
--cc=konstantin.weitz@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mtosatti@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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