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: Tue, 13 Mar 2012 20:56:21 -0400 From: Chris Metcalf <cmetcalf@...era.com> To: Stephen Rothwell <sfr@...b.auug.org.au> CC: <linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>, Heiko Carstens <heiko.carstens@...ibm.com> Subject: Re: linux-next: manual merge of the tile tree with Linus' tree On 3/13/2012 8:10 PM, Stephen Rothwell wrote: > Hi Chris, > > Today's linux-next merge of the tile tree got a conflict in arch/Kconfig > between commit 43570fd2f47b ("mm,slub,x86: decouple size of struct page > from CONFIG_CMPXCHG_LOCAL") (and a couple after) from Linus' tree and > commit ca3a3d347e23 ("ipc: provide generic compat versions of IPC > syscalls") from the tile tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary. Thanks! I'll sync up that tree over the next couple of days as I start pushing out some more changes to get ready for 3.4 merge window. -- Chris Metcalf, Tilera Corp. http://www.tilera.com -- 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