From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Sep 2014 15:11:43 +0000 (-0700)
Subject: Merge branch 'akpm' (fixes from Andrew Morton)
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8207649c41bf5c28a987be47d66545fa9d2994d8;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'akpm' (fixes from Andrew Morton)

Merge fixes from Andrew Morton:
 "9 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: softdirty: keep bit when zapping file pte
  fs/cachefiles: add missing \n to kerror conversions
  genalloc: fix device node resource counter
  drivers/rtc/rtc-efi.c: add missing module alias
  mm, slab: initialize object alignment on cache creation
  mm: softdirty: addresses before VMAs in PTE holes aren't softdirty
  ocfs2/dlm: do not get resource spinlock if lockres is new
  nilfs2: fix data loss with mmap()
  ocfs2: free vol_label in ocfs2_delete_osb()
---

8207649c41bf5c28a987be47d66545fa9d2994d8