Merge branch 'for-5.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 May 2020 17:58:19 +0000 (10:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 May 2020 17:58:19 +0000 (10:58 -0700)
commit3301f6ae2d4cb396ae0c103329a5680d14f7a5c6
tree83b63cc5c0063392de969fe3d05b07f53da0c0d8
parent006f38a1c3dcbe237a75e725fe457bd59cb489c4
parenteec8fd0277e37cf447b88c6be181e81df867bcf1
Merge branch 'for-5.7-fixes' of git://git./linux/kernel/git/tj/cgroup

Pull cgroup fixes from Tejun Heo:

 - Reverted stricter synchronization for cgroup recursive stats which
   was prepping it for event counter usage which never got merged. The
   change was causing performation regressions in some cases.

 - Restore bpf-based device-cgroup operation even when cgroup1 device
   cgroup is disabled.

 - An out-param init fix.

* 'for-5.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  device_cgroup: Cleanup cgroup eBPF device filter code
  xattr: fix uninitialized out-param
  Revert "cgroup: Add memory barriers to plug cgroup_rstat_updated() race window"