This is a refresh of older patches that fell through the cracks.

Applies on top of mm-unstable.

 Documentation/admin-guide/cgroup-v1/memory.rst  |  4 +-
 Documentation/admin-guide/kernel-parameters.txt |  6 --
 arch/mips/configs/db1xxx_defconfig              |  1 -
 arch/mips/configs/generic_defconfig             |  1 -
 arch/powerpc/configs/powernv_defconfig          |  1 -
 arch/powerpc/configs/pseries_defconfig          |  1 -
 arch/sh/configs/sdk7786_defconfig               |  1 -
 arch/sh/configs/urquell_defconfig               |  1 -
 include/linux/swap.h                            |  2 +-
 include/linux/swap_cgroup.h                     |  4 +-
 init/Kconfig                                    |  5 --
 mm/Makefile                                     |  4 +-
 mm/memcontrol.c                                 | 79 ++++++++---------------
 mm/swap_cgroup.c                                |  6 ++
 tools/testing/selftests/cgroup/config           |  1 -
 15 files changed, 39 insertions(+), 78 deletions(-)