lkml.org 
[lkml]   [2011]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the akpm tree with the vhost tree
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

[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2011-11-29 04:49    [W:2.146 / U:0.512 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site