Merge branch 'akpm' (incoming from Andrew)

Merge second patch-bomb from Andrew Morton:
 - the rest of MM
 - zram updates
 - zswap updates
 - exit
 - procfs
 - exec
 - wait
 - crash dump
 - lib/idr
 - rapidio
 - adfs, affs, bfs, ufs
 - cris
 - Kconfig things
 - initramfs
 - small amount of IPC material
 - percpu enhancements
 - early ioremap support
 - various other misc things

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (156 commits)
  MAINTAINERS: update Intel C600 SAS driver maintainers
  fs/ufs: remove unused ufs_super_block_third pointer
  fs/ufs: remove unused ufs_super_block_second pointer
  fs/ufs: remove unused ufs_super_block_first pointer
  fs/ufs/super.c: add __init to init_inodecache()
  doc/kernel-parameters.txt: add early_ioremap_debug
  arm64: add early_ioremap support
  arm64: initialize pgprot info earlier in boot
  x86: use generic early_ioremap
  mm: create generic early_ioremap() support
  x86/mm: sparse warning fix for early_memremap
  lglock: map to spinlock when !CONFIG_SMP
  percpu: add preemption checks to __this_cpu ops
  vmstat: use raw_cpu_ops to avoid false positives on preemption checks
  slub: use raw_cpu_inc for incrementing statistics
  net: replace __this_cpu_inc in route.c with raw_cpu_inc
  modules: use raw_cpu_write for initialization of per cpu refcount.
  mm: use raw_cpu ops for determining current NUMA node
  percpu: add raw_cpu_ops
  slub: fix leak of 'name' in sysfs_slab_add
  ...

1 files changed, 30 insertions, 9 deletions

diff --git a/Documentation/ABI/testing/sysfs-block-zram b/Documentation/ABI/testing/sysfs-block-zram
index 3f0b9ae61d8c..70ec992514d0 100644
--- a/Documentation/ABI/testing/sysfs-block-zram
+++ b/Documentation/ABI/testing/sysfs-block-zram
@@ -43,6 +43,36 @@ Description:
                 The invalid_io file is read-only and specifies the number of
                 non-page-size-aligned I/O requests issued to this device.
 
+What:           /sys/block/zram<id>/failed_reads
+Date:           February 2014
+Contact:        Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
+Description:
+                The failed_reads file is read-only and specifies the number of
+                failed reads happened on this device.
+
+What:           /sys/block/zram<id>/failed_writes
+Date:           February 2014
+Contact:        Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
+Description:
+                The failed_writes file is read-only and specifies the number of
+                failed writes happened on this device.
+
+What:           /sys/block/zram<id>/max_comp_streams
+Date:           February 2014
+Contact:        Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
+Description:
+                The max_comp_streams file is read-write and specifies the
+                number of backend's zcomp_strm compression streams (number of
+                concurrent compress operations).
+
+What:           /sys/block/zram<id>/comp_algorithm
+Date:           February 2014
+Contact:        Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
+Description:
+                The comp_algorithm file is read-write and lets to show
+                available and selected compression algorithms, change
+                compression algorithm selection.
+
 What:           /sys/block/zram<id>/notify_free
 Date:           August 2010
 Contact:        Nitin Gupta <ngupta@vflare.org>
@@ -53,15 +83,6 @@ Description:
                 is freed. This statistic is applicable only when this disk is
                 being used as a swap disk.
 
-What:           /sys/block/zram<id>/discard
-Date:           August 2010
-Contact:        Nitin Gupta <ngupta@vflare.org>
-Description:
-                The discard file is read-only and specifies the number of
-                discard requests received by this device. These requests
-                provide information to block device regarding blocks which are
-                no longer used by filesystem.
-
 What:           /sys/block/zram<id>/zero_pages
 Date:           August 2010
 Contact:        Nitin Gupta <ngupta@vflare.org>