From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 Sep 2012 19:43:01 +0000 (-0700)
Subject: Merge tag 'for-linus-v3.6-rc7' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: v3.6-rc7~15
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=789f95b788146ec27ab068103aacd546d05db266;p=users%2Fjedix%2Flinux-maple.git

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

Pull xfs bugfixes from Ben Myers:
 - fix a regression related to xfs_sync_worker racing with unmount.
 - fix a race while discarding xfs buffers.

* tag 'for-linus-v3.6-rc7' of git://oss.sgi.com/xfs/xfs:
  xfs: stop the sync worker before xfs_unmountfs
  xfs: fix race while discarding buffers [V4]
---

789f95b788146ec27ab068103aacd546d05db266