Johannes Weiner
c792e82403
mm: memcontrol: drop superfluous entry in the per-memcg stats array
...
MEM_CGROUP_STAT_NSTATS is just a delimiter for cgroup1 statistics, not
an actual array entry. Reuse it for the first cgroup2 stat entry, like
in the event array.
Fixes: b2807f07f4 ("mm: memcontrol: add "sock" to cgroup2 memory.stat")
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Vladimir Davydov <vdavydov@virtuozzo.com>
Cc: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-02-03 08:28:43 -08:00
..
acpi
Merge branches 'acpica', 'acpi-video' and 'acpi-fan'
2016-01-21 00:41:59 +01:00
asm-generic
Merge branch 'akpm' (patches from Andrew)
2016-01-21 12:32:08 -08:00
clocksource
crypto
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2016-01-22 11:58:43 -08:00
drm
drm/atomic-helper: Export framebuffer_changed()
2016-01-20 08:55:43 +08:00
dt-bindings
ARM: SoC driver updates for v4.5
2016-01-20 18:42:30 -08:00
keys
kvm
linux
mm: memcontrol: drop superfluous entry in the per-memcg stats array
2016-02-03 08:28:43 -08:00
math-emu
media
memory
misc
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-02-01 15:56:08 -08:00
pcmcia
ras
rdma
IB/mlx4: Enable send of RoCE QP1 packets with IP/UDP headers
2016-01-19 15:35:01 -05:00
rxrpc
scsi
Initial roundup of 4.5 merge window patches
2016-01-23 18:45:06 -08:00
soc
ARM: SoC driver updates for v4.5
2016-01-20 18:42:30 -08:00
sound
ALSA: timer: Introduce disconnect op to snd_timer_instance
2016-01-21 17:51:42 +01:00
target
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2016-01-20 17:20:53 -08:00
trace
This includes three minor fixes, mostly due to cut-and-paste issues.
2016-01-28 17:00:50 -08:00
uapi
Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
2016-02-01 15:21:20 -08:00
video
xen
Merge branch 'for-4.5/drivers' of git://git.kernel.dk/linux-block
2016-01-21 18:19:38 -08:00
Kbuild