lkml.org 
[lkml]   [2011]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the tmem tree with the trivial tree
Hi Dan,

Today's linux-next merge of the tmem tree got a conflict in
mm/cleancache.c between commit c460578a674f ("Documentation: fix broken
references") from the tree and commit c3adff5aa194 ("mm: cleancache:
report statistics via debugfs instead of sysfs") from the tmem tree.

The latter removed the comment that the former was correcting. So I sued
the letter version.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2011-09-22 10:09    [W:0.050 / U:0.508 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site