From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 18 Nov 2012 18:29:34 +0000 (-1000)
Subject: Merge tag 'for-linus-v3.7-rc7' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: firefly_0821_release~3680^2~1621
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d28d3730fd377cf275a7ac00457ff5012841ee96;p=firefly-linux-kernel-4.4.55.git

Merge tag 'for-linus-v3.7-rc7' of git://oss.sgi.com/xfs/xfs

Pull xfs bugfixes from Ben Myers:

 - fix attr tree double split corruption

 - fix broken error handling in xfs_vm_writepage

 - drop buffer io reference when a bad bio is built

* tag 'for-linus-v3.7-rc7' of git://oss.sgi.com/xfs/xfs:
  xfs: drop buffer io reference when a bad bio is built
  xfs: fix broken error handling in xfs_vm_writepage
  xfs: fix attr tree double split corruption
---

d28d3730fd377cf275a7ac00457ff5012841ee96