Merge branch 'akpm' (patches from Andrew)

Browse source

Merge misc fixes from Andrew Morton:
 "7 patches.

  Subsystems affected by this patch series: lib, ocfs2, and mm (slub,
  migration, and memcg)"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm/memcg: fix NULL pointer dereference in memcg_slab_free_hook()
  slub: fix unreclaimable slab stat for bulk free
  mm/migrate: fix NR_ISOLATED corruption on 64-bit
  mm: memcontrol: fix blocking rstat function called from atomic cgroup1 thresholding code
  ocfs2: issue zeroout to EOF blocks
  ocfs2: fix zero out valid data
  lib/test_string.c: move string selftest in the Runtime Testing menu

...

This commit is contained in:

Linus Torvalds 2021-07-30 10:29:58 -07:00

parent 764a5bc89b 121dffe20b

commit ad6ec09d96

7 changed files with 81 additions and 57 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

103

fs/ocfs2/file.c

View file

3

lib/Kconfig

View file

3

lib/Kconfig.debug

View file

3

mm/memcontrol.c

View file

2

mm/migrate.c

View file

2

mm/slab.h

View file

22

mm/slub.c

View file