linux-kernel - linux-next: manual merge of the kvm tree with the tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20140311200914.2cf12d61480eca0044691007@kernel.org>
Date:	Tue, 11 Mar 2014 20:09:14 +0000
From:	Mark Brown <broonie@...nel.org>
To:	Marcelo Tosatti <mtosatti@...hat.com>,
	Gleb Natapov <gleb@...nel.org>,
	Konstantin Weitz <konstantin.weitz@...il.com>,
	Christian Borntraeger <borntraeger@...ibm.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the kvm tree with the  tree

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));


Content of type "application/pgp-signature" skipped