From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Sep 2016 22:51:10 +0000 (-0700)
Subject: Merge branch 'akpm' (patches from Andrew)
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~9349
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=dbd8805b0ad46f04cababea5d01f072142961411;p=mirror_ubuntu-focal-kernel.git

Merge branch 'akpm' (patches from Andrew)

Merge more fixes from Andrew Morton:
 "Three fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  include/linux/property.h: fix typo/compile error
  ocfs2: fix deadlock on mmapped page in ocfs2_write_begin_nolock()
  mm: workingset: fix crash in shadow node shrinker caused by replace_page_cache_page()
---

dbd8805b0ad46f04cababea5d01f072142961411