• Linus Torvalds's avatar
    Merge branch 'akpm' (patches from Andrew) · eae21770
    Linus Torvalds authored
    Merge third patch-bomb from Andrew Morton:
     "I'm pretty much done for -rc1 now:
       - the rest of MM, basically
       - lib/ updates
       - checkpatch, epoll, hfs, fatfs, ptrace, coredump, exit
       - cpu_mask simplifications
       - kexec, rapidio, MAINTAINERS etc, etc.
       - more dma-mapping cleanups/simplifications from hch"
    * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (109 commits)
      MAINTAINERS: add/fix git URLs for various subsystems
      mm: memcontrol: add "sock" to cgroup2 memory.stat
      mm: memcontrol: basic memory statistics in cgroup2 memory controller
      mm: memcontrol: do not uncharge old page in page cache replacement
      Documentation: cgroup: add memory.swap.{current,max} description
      mm: free swap cache aggressively if memcg swap is full
      mm: vmscan: do not scan anon pages if memcg swap limit is hit
      swap.h: move memcg related stuff to the end of the file
      mm: memcontrol: replace mem_cgroup_lruvec_online with mem_cgroup_online
      mm: vmscan: pass memcg to get_scan_count()
      mm: memcontrol: charge swap to cgroup2
      mm: memcontrol: clean up alloc, online, offline, free functions
      mm: memcontrol: flatten struct cg_proto
      mm: memcontrol: rein in the CONFIG space madness
      net: drop tcp_memcontrol.c
      mm: memcontrol: introduce CONFIG_MEMCG_LEGACY_KMEM
      mm: memcontrol: allow to disable kmem accounting for cgroup2
      mm: memcontrol: account "kmem" consumers in cgroup2 memory controller
      mm: memcontrol: move kmem accounting code to CONFIG_MEMCG
      mm: memcontrol: separate kmem code from legacy tcp accounting code
Kconfig 1.12 KB