From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 28 Apr 2021 01:47:42 +0000 (-0700)
Subject: Merge branch 'for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
X-Git-Tag: v5.15~1270
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=55e6be657b8d774d9a2e67363e5bcbbaf80fdc28;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'for-5.13' of git://git./linux/kernel/git/tj/cgroup

Pull cgroup changes from Tejun Heo:
 "The only notable change is Vipin's new misc cgroup controller.

  This implements generic support for resources which can be controlled
  by simply counting and limiting the number of resource instances - ie
  there's X number of these on the system and this cgroup subtree can
  have upto Y of those.

  The first user is the address space IDs used for virtual machine
  memory encryption and expected future usages are similar - niche
  hardware features with concrete resource limits and simple usage
  models"

* 'for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroup: use tsk->in_iowait instead of delayacct_is_task_waiting_on_io()
  cgroup/cpuset: fix typos in comments
  cgroup: misc: mark dummy misc_cg_res_total_usage() static inline
  svm/sev: Register SEV and SEV-ES ASIDs to the misc controller
  cgroup: Miscellaneous cgroup documentation.
  cgroup: Add misc cgroup controller
---

55e6be657b8d774d9a2e67363e5bcbbaf80fdc28