From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 18 Oct 2014 20:32:17 +0000 (-0700)
Subject: Merge branch 'for-linus-update' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.18-rc1~18
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ef161ea1ff96337cbe2253afb72636474d90598e;p=~emulex%2Finfiniband.git

Merge branch 'for-linus-update' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

Pull btrfs data corruption fix from Chris Mason:
 "I'm testing a pull with more fixes, but wanted to get this one out so
  Greg can pick it up.

  The corruption isn't easy to hit, you have to do a readonly snapshot
  and have orphans in the snapshot.  But my review and testing missed
  the bug.  Filipe has added a better xfstest to cover it"

* 'for-linus-update' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Revert "Btrfs: race free update of commit root for ro snapshots"
---

ef161ea1ff96337cbe2253afb72636474d90598e