Patch "memcg: convert threshold to bytes" has been added to the 4.2-stable tree

This is a note to let you know that I've just added the patch titled

memcg: convert threshold to bytes

to the 4.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
memcg-convert-threshold-to-bytes.patch
and it can be found in the queue-4.2 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Shaohua Li <[email protected]>
Date: Thu, 15 Oct 2015 15:28:29 -0700
Subject: memcg: convert threshold to bytes

From: Shaohua Li <[email protected]>

commit 424cdc14138088ada1b0e407a2195b2783c6e5ef upstream.

page_counter_memparse() returns pages for the threshold, while mem_cgroup_usage() returns bytes for memory usage. Convert the threshold to bytes.

---
 mm/memcontrol.c |    1 +
 1 file changed, 1 insertion(+)

@@ -3687,6 +3687,7 @@ static int __mem_cgroup_usage_register_e
 	ret = page_counter_memparse(args, "-1", &threshold);
 	if (ret)
 		return ret;
+	threshold <<= PAGE_SHIFT;
 
 	mutex_lock(&memcg->thresholds_lock);
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.2/memcg-convert-threshold-to-bytes.patch