From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Oct 2015 13:10:51 +0000 (+0900)
Subject: Merge branch 'akpm' (patches from Andrew)
X-Git-Tag: firefly_0821_release~176^2~891
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9f30931a5482d66710210dafe9b4f2cc92320540;p=firefly-linux-kernel-4.4.55.git

Merge branch 'akpm' (patches from Andrew)

Merge fixes from Andrew Morton:
 "9 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  ocfs2/dlm: unlock lockres spinlock before dlm_lockres_put
  fault-inject: fix inverted interval/probability values in printk
  lib/Kconfig.debug: disable -Wframe-larger-than warnings with KASAN=y
  mm: make sendfile(2) killable
  thp: use is_zero_pfn() only after pte_present() check
  mailmap: update Javier Martinez Canillas' email
  MAINTAINERS: add Sergey as zsmalloc reviewer
  mm: cma: fix incorrect type conversion for size during dma allocation
  kmod: don't run async usermode helper as a child of kworker thread
---

9f30931a5482d66710210dafe9b4f2cc92320540