Merge tag 'stable/frontswap.v16-tag' of git://git.kernel.org/pub/scm/linux/kernel...

Pull frontswap feature from Konrad Rzeszutek Wilk:
 "Frontswap provides a "transcendent memory" interface for swap pages.
  In some environments, dramatic performance savings may be obtained
  because swapped pages are saved in RAM (or a RAM-like device) instead
  of a swap disk.  This tag provides the basic infrastructure along with
  some changes to the existing backends."

Fix up trivial conflict in mm/Makefile due to removal of swap token code
changing a line next to the new frontswap entry.

This pull request came in before the merge window even opened, it got
delayed to after the merge window by me just wanting to make sure it had
actual users.  Apparently IBM is using this on their embedded side, and
Jan Beulich says that it's already made available for SLES and OpenSUSE
users.

Also acked by Rik van Riel, and Konrad points to other people liking it
too.  So in it goes.

By Dan Magenheimer (4) and Konrad Rzeszutek Wilk (2)
via Konrad Rzeszutek Wilk
* tag 'stable/frontswap.v16-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm:
  frontswap: s/put_page/store/g s/get_page/load
  MAINTAINER: Add myself for the frontswap API
  mm: frontswap: config and doc files
  mm: frontswap: core frontswap functionality
  mm: frontswap: core swap subsystem hooks and headers
  mm: frontswap: add frontswap header file

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/staging/ramster/zcache-main.c
Simple merge

diff --cc include/linux/swap.h
Simple merge

diff --cc mm/Kconfig
Simple merge

diff --cc mm/Makefile
index a156285,306742a..2e2fbbe
--- 1/mm/Makefile
--- 2/mm/Makefile
+++ b/mm/Makefile
@@@ -28,7 -25,8 +28,8 @@@ endi
  obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o
  
  obj-$(CONFIG_BOUNCE)  += bounce.o
 -obj-$(CONFIG_SWAP)    += page_io.o swap_state.o swapfile.o thrash.o
 +obj-$(CONFIG_SWAP)    += page_io.o swap_state.o swapfile.o
+ obj-$(CONFIG_FRONTSWAP)       += frontswap.o
  obj-$(CONFIG_HAS_DMA) += dmapool.o
  obj-$(CONFIG_HUGETLBFS)       += hugetlb.o
  obj-$(CONFIG_NUMA)    += mempolicy.o

diff --cc mm/swapfile.c
Simple merge