From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 11 Sep 2015 19:38:25 +0000 (-0700)
Subject: Merge branch 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e91eb6204fb826116453e43d4f5cf0f666bf46fe;p=openwrt%2Fstaging%2Fblogic.git

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

Pull btrfs cleanups and fixes from Chris Mason:
 "These are small cleanups, and also some fixes for our async worker
  thread initialization.

  I was having some trouble testing these, but it ended up being a
  combination of changing around my test servers and a shiny new
  schedule while atomic from the new start/finish_plug in
  writeback_sb_inodes().

  That one only hits on btrfs raid5/6 or MD raid10, and if I wasn't
  changing a bunch of things in my test setup at once it would have been
  really clear.  Fix for writeback_sb_inodes() on the way as well"

* 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: cleanup: remove unnecessary check before btrfs_free_path is called
  btrfs: async_thread: Fix workqueue 'max_active' value when initializing
  btrfs: Add raid56 support for updating  num_tolerated_disk_barrier_failures in btrfs_balance
  btrfs: Cleanup for btrfs_calc_num_tolerated_disk_barrier_failures
  btrfs: Remove noused chunk_tree and chunk_objectid from scrub_enumerate_chunks and scrub_chunk
  btrfs: Update out-of-date "skip parity stripe" comment
---

e91eb6204fb826116453e43d4f5cf0f666bf46fe