From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Jul 2014 16:22:00 +0000 (-0700)
Subject: Merge branch 'akpm' (patches from Andrew Morton)
X-Git-Tag: v3.16-rc4~17
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5170a3b24a9141e2349a3420448743b7c68f2223;p=~emulex%2Finfiniband.git

Merge branch 'akpm' (patches from Andrew Morton)

Merge fixes from Andrew Morton:
 "14 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  shmem: fix init_page_accessed use to stop !PageLRU bug
  kernel/printk/printk.c: revert "printk: enable interrupts before calling console_trylock_for_printk()"
  tools/testing/selftests/ipc/msgque.c: improve error handling when not running as root
  fs/seq_file: fallback to vmalloc allocation
  /proc/stat: convert to single_open_size()
  hwpoison: fix the handling path of the victimized page frame that belong to non-LRU
  mm:vmscan: update the trace-vmscan-postprocess.pl for event vmscan/mm_vmscan_lru_isolate
  msync: fix incorrect fstart calculation
  zram: revalidate disk after capacity change
  tools: memory-hotplug fix unexpected operator error
  tools: cpu-hotplug fix unexpected operator error
  autofs4: fix false positive compile error
  slub: fix off by one in number of slab tests
  mm: page_alloc: fix CMA area initialisation when pageblock > MAX_ORDER
---

5170a3b24a9141e2349a3420448743b7c68f2223