From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 Oct 2011 05:06:39 +0000 (+1200)
Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: firefly_0821_release~3680^2~4359
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=480082968a78151e731ebd304eeb6cada61a1cd1;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: revert to using a kthread for AIL pushing
  xfs: force the log if we encounter pinned buffers in .iop_pushbuf
  xfs: do not update xa_last_pushed_lsn for locked items
---

480082968a78151e731ebd304eeb6cada61a1cd1