public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Tejun Heo <tj@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, Li Zefan <lizefan@huawei.com>,
	Johannes Weiner <hannes@cmpxchg.org>,
	cgroups@vger.kernel.org, Waiman Long <longman@redhat.com>
Subject: [GIT PULL] cgroup fixes for v4.13-rc7
Date: Tue, 29 Aug 2017 11:09:08 -0700	[thread overview]
Message-ID: <20170829180908.GU491396@devbig577.frc2.facebook.com> (raw)

Hello,

A late but obvious fix for cgroup.  I broke "cpuset.memory_pressure"
file a long time ago (v4.4) by accidentally deleting its file index,
which made it a duplicate of the "cpuset.memory_migrate" file.
Spotted and fixed by Waiman.

Thanks.

The following changes since commit 3c74541777302eec43a0d1327c4d58b8659a776b:

  cgroup: fix error return value from cgroup_subtree_control() (2017-07-23 08:15:17 -0400)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git for-4.13-fixes

for you to fetch changes up to 1c08c22c874ac88799cab1f78c40f46110274915:

  cpuset: Fix incorrect memory_pressure control file mapping (2017-08-24 09:42:28 -0700)

----------------------------------------------------------------
Waiman Long (1):
      cpuset: Fix incorrect memory_pressure control file mapping

 kernel/cgroup/cpuset.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index ca8376e..8362bac 100644
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -1891,6 +1891,7 @@ static struct cftype files[] = {
 	{
 		.name = "memory_pressure",
 		.read_u64 = cpuset_read_u64,
+		.private = FILE_MEMORY_PRESSURE,
 	},
 
 	{

                 reply	other threads:[~2017-08-29 18:09 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170829180908.GU491396@devbig577.frc2.facebook.com \
    --to=tj@kernel.org \
    --cc=cgroups@vger.kernel.org \
    --cc=hannes@cmpxchg.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizefan@huawei.com \
    --cc=longman@redhat.com \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox