From: Linus Torvalds Date: Tue, 29 Aug 2017 18:16:21 +0000 (-0700) Subject: Merge branch 'for-4.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... X-Git-Tag: Ubuntu-5.2.0-15.16~6164 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4.13.0-rc7-00015-g36fde05f3fb5;p=mirror_ubuntu-eoan-kernel.git 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 --- 36fde05f3fb51edea879636db590d70e11f16c82