linux-kernel - linux-next: manual merge of the kvm tree with the x86 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 for Android: free password hash cracker in your pocket

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

Message-Id: <20090603115058.947305fc.sfr@canb.auug.org.au>
Date:	Wed, 3 Jun 2009 11:50:58 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Avi Kivity <avi@...ranet.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Hidetoshi Seto <seto.hidetoshi@...fujitsu.com>,
	Jan Kiszka <jan.kiszka@...mens.com>
Subject: linux-next: manual merge of the kvm tree with the x86 tree

Hi Avi,

Today's linux-next merge of the kvm tree got a conflict in
arch/x86/include/asm/mce.h between commits
06b851d98266b812b2fa23d007cdf53f41194bbb ("x86, mce: unify, prepare 64bit
in mce.h") and 01c6680a547a3ee8dd170c269ea8e037b3191b71 ("x86, mce:
Cleanup MCG definitions") from the x86 tree and commit
1a6a35a1c82eb3b95719a375da2e3aac2910a1df ("x86: Make MCE defines
32-bit-safe") from the kvm tree.

I think the latter is subsumed by the former commits.  I fixed it up (by
using the version from the x86 tree) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped