| 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
| ||
|
Message-Id: <20090609193246.d86bf703.sfr@canb.auug.org.au>
Date: Tue, 9 Jun 2009 19:32:46 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: James Bottomley <James.Bottomley@...senPartnership.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Rusty Russell <rusty@...tcorp.com.au>
Subject: linux-next: manual merge of the voyager tree with the rr tree
Hi James,
Today's linux-next merge of the voyager tree got a conflict in
drivers/lguest/Kconfig between commit
7f8f1b5390ac9c433b0c4c693201a36fa3234a41 ("lguest:eventfd-notify") from
the rr tree and commit 0ff51d1467af91bca4210b0d09372b6e7ded7524 ("Revert
"x86: remove the Voyager 32-bit subarch"") from the voyager tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc drivers/lguest/Kconfig
index 6c566c1,76f2b36..0000000
--- a/drivers/lguest/Kconfig
+++ b/drivers/lguest/Kconfig
@@@ -1,6 -1,6 +1,6 @@@
config LGUEST
tristate "Linux hypervisor example code"
- depends on X86_32 && EXPERIMENTAL && !X86_PAE && EVENTFD
- depends on X86_32 && EXPERIMENTAL && !X86_PAE && FUTEX && !X86_VOYAGER
++ depends on X86_32 && EXPERIMENTAL && !X86_PAE && EVENTFD && !X86_VOYAGER
select HVC_DRIVER
---help---
This is a very simple module which allows you to run
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists