From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Nov 2010 16:11:03 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: firefly_0821_release~7613^2~3456
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fb1cb7b27bba3446bed377c173dbdd2d288e3992;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: remove incorrect assert in xfs_vm_writepage
  xfs: use hlist_add_fake
  xfs: fix a few compiler warnings with CONFIG_XFS_QUOTA=n
  xfs: tell lockdep about parent iolock usage in filestreams
  xfs: move delayed write buffer trace
  xfs: fix per-ag reference counting in inode reclaim tree walking
  xfs: xfs_ioctl: fix information leak to userland
  xfs: remove experimental tag from the delaylog option
---

fb1cb7b27bba3446bed377c173dbdd2d288e3992