* linux-next: manual merge of the akpm tree with the vhost tree
@ 2011-11-29 3:46 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2011-11-29 3:46 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Heiko Carstens
[-- Attachment #1: Type: text/plain, Size: 460 bytes --]
Hi Andrew,
Today's linux-next merge of the akpn tree got a conflict in
arch/x86/Kconfig between commit 4673ca8eb369 ("lib: move GENERIC_IOMAP to
lib/Kconfig") from the vhost tree and commit c7b45fe332ee ("mm,slub,x86:
decouple size of struct page from CONFIG_CMPXCHG_LOCAL") from the akpm
tree.
Just overlapping additions. I fixed it up and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-11-29 3:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-11-29 3:46 linux-next: manual merge of the akpm tree with the vhost tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).