From: Linus Torvalds Date: Fri, 23 Mar 2012 02:52:47 +0000 (-0700) Subject: Merge tag 'stable/for-linus-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: http://git.alex.org.uk Merge tag 'stable/for-linus-3.4' of git://git./linux/kernel/git/konrad/mm Pull cleancache changes from Konrad Rzeszutek Wilk: "This has some patches for the cleancache API that should have been submitted a _long_ time ago. They are basically cleanups: - rename of flush to invalidate - moving reporting of statistics into debugfs - use __read_mostly as necessary. Oh, and also the MAINTAINERS file change. The files (except the MAINTAINERS file) have been in #linux-next for months now. The late addition of MAINTAINERS file is a brain-fart on my side - didn't realize I needed that just until I was typing this up - and I based that patch on v3.3 - so the tree is on top of v3.3." * tag 'stable/for-linus-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm: MAINTAINERS: Adding cleancache API to the list. mm: cleancache: Use __read_mostly as appropiate. mm: cleancache: report statistics via debugfs instead of sysfs. mm: zcache/tmem/cleancache: s/flush/invalidate/ mm: cleancache: s/flush/invalidate/ --- aab008db8063364dc3c8ccf4981c21124866b395 diff --cc Documentation/vm/cleancache.txt index d5c615a,f726717..142fbb0 --- a/Documentation/vm/cleancache.txt +++ b/Documentation/vm/cleancache.txt @@@ -90,9 -91,9 +91,9 @@@ can be measured (across all filesystems succ_gets - number of gets that were successful failed_gets - number of gets that failed puts - number of puts attempted (all "succeed") - flushes - number of flushes attempted + invalidates - number of invalidates attempted -A backend implementatation may provide additional metrics. +A backend implementation may provide additional metrics. FAQ