lkml.org 
[lkml]   [2011]   [Sep]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: linux-next: manual merge of the akpm tree with the slab tree
From
On Wed, Sep 14, 2011 at 9:24 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Andrew,
>
> Today's linux-next merge of the scsi-post-merge tree got a conflict in
> mm/slab.c between commit fdde6abb3e8d ("slab: use print_hex_dump") from
> the slab tree and commit 0cf5ab251a1a ("When we get corruption reports,
> it's useful to see if the kernel was") from the akpm tree.
>
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Andrew, if you send me the patch to penberg@cs.helsinki.fi, I can fix
up the conflict and carry it in my tree.

Pekka
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2011-09-14 08:37    [from the cache]
©2003-2011 Jasper Spaans