lkml.org 
[lkml]   [2012]   [Aug]   [17]   [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 slab tree
Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
mm/slab_common.c between commit 77be4b1366c9 ("mm/slab: restructure
kmem_cache_create() debug checks") from the slab tree and commit
"mm/slab_common.c: cleanup" from the akpm tree.

Given that this akpm tree patch was applied to and then reverted from the
slab tree, I have just dropped it from the akpm tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-08-17 07:41    [W:0.024 / U:0.656 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site