From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 2 Dec 2011 18:38:20 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: firefly_0821_release~3680^2~4014
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ffb8fb5469315755ec2dd462452dcb869b358d55;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: fix attr2 vs large data fork assert
  xfs: force buffer writeback before blocking on the ilock in inode reclaim
  xfs: validate acl count
---

ffb8fb5469315755ec2dd462452dcb869b358d55