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
| ||
|
Date: Thu, 1 Nov 2012 14:41:17 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Mukesh Rathor <mukesh.rathor@...cle.com>
Subject: linux-next: manual merge of the tmem tree with the xen-two tree
Hi Konrad,
Today's linux-next merge of the tmem tree got a conflict in
arch/x86/xen/smp.c between commits 1ba23a0f2605 ("xen/smp: Move the
common CPU init code a bit to prep for PVH patch") and 6c6067f26388
("xen/pvh: Extend vcpu_guest_context, p2m, event, and XenBus") from the
xen-two tree and commit 7282a68f5aea ("PVH: Basic and preparatory
changes") from the tmem tree.
I fixed it up (using the xen-two tree version) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists