| commit | 36fde05f3fb51edea879636db590d70e11f16c82 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 29 11:16:21 2017 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 29 11:16:21 2017 -0700 |
| tree | c7c707541f7ebcd0acf77faf9c8d6995dfd8be18 | |
| parent | 31a3faf3229697d646eab0fc942b24d73b0bcfa1 [diff] | |
| parent | 1c08c22c874ac88799cab1f78c40f46110274915 [diff] |
Merge branch 'for-4.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup Pull cgroup fix from Tejun Heo: "A late but obvious fix for cgroup. I broke the '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" * 'for-4.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: cpuset: Fix incorrect memory_pressure control file mapping