From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 25 Jun 2016 15:42:31 +0000 (-0700)
Subject: Merge branch 'for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mason... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b971712afc8dd0de38e943ea9d904fe8c8aff956;p=deliverable%2Flinux.git

Merge branch 'for-linus-4.7' of git://git./linux/kernel/git/mason/linux-btrfs

Pull btrfs fixes from Chris Mason:
 "I have a two part pull this time because one of the patches Dave
  Sterba collected needed to be against v4.7-rc2 or higher (we used
  rc4).  I try to make my for-linus-xx branch testable on top of the
  last major so we can hand fixes to people on the list more easily, so
  I've split this pull in two.

  This first part has some fixes and two performance improvements that
  we've been testing for some time.

  Josef's two performance fixes are most notable.  The transid tracking
  patch makes a big improvement on pretty much every workload"

* 'for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: Force stripesize to the value of sectorsize
  btrfs: fix disk_i_size update bug when fallocate() fails
  Btrfs: fix error handling in map_private_extent_buffer
  Btrfs: fix error return code in btrfs_init_test_fs()
  Btrfs: don't do nocow check unless we have to
  btrfs: fix deadlock in delayed_ref_async_start
  Btrfs: track transid for delayed ref flushing
---

b971712afc8dd0de38e943ea9d904fe8c8aff956