From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751675AbdH2SJO (ORCPT ); Tue, 29 Aug 2017 14:09:14 -0400 Received: from mail-qk0-f195.google.com ([209.85.220.195]:38019 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750822AbdH2SJM (ORCPT ); Tue, 29 Aug 2017 14:09:12 -0400 Date: Tue, 29 Aug 2017 11:09:08 -0700 From: Tejun Heo To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, Li Zefan , Johannes Weiner , cgroups@vger.kernel.org, Waiman Long Subject: [GIT PULL] cgroup fixes for v4.13-rc7 Message-ID: <20170829180908.GU491396@devbig577.frc2.facebook.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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, }, {