Messages in this thread | | | Date | Thu, 22 Sep 2011 18:06:59 +1000 | From | Stephen Rothwell <> | Subject | linux-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] | |