From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Oct 2015 19:55:34 +0000 (-0700)
Subject: Merge branch 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason... 
X-Git-Tag: v4.3-rc6~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6aa8ca4df0c1e2095c3f9f6fc28d85a991787879;p=karo-tx-linux.git

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

Pull btrfs fixes from Chris Mason:
 "I have two more bug fixes for btrfs.

  My commit fixes a bug we hit last week at FB, a combination of lots of
  hard links and an admin command to resolve inode numbers.

  Dave is adding checks to make sure balance on current kernels ignores
  filters it doesn't understand.  The penalty for being wrong is just
  doing more work (not crashing etc), but it's a good fix"

* 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  btrfs: fix use after free iterating extrefs
  btrfs: check unsupported filters in balance arguments
---

6aa8ca4df0c1e2095c3f9f6fc28d85a991787879