From: Linus Torvalds <torvalds@linux-foundation.org>
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-Url: https://git.stricted.de/?a=commitdiff_plain;h=36fde05f3fb51edea879636db590d70e11f16c82;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'for-4.13-fixes' of git://git./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