From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 9 Apr 2016 17:41:34 +0000 (-0700)
Subject: Merge branch 'for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mason... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=839a3f765728cdca0057a12e2dc0bf669ac1c22e;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

Pull btrfs fixes from Chris Mason:
 "These are bug fixes, including a really old fsync bug, and a few trace
  points to help us track down problems in the quota code"

* 'for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: fix file/data loss caused by fsync after rename and new inode
  btrfs: Reset IO error counters before start of device replacing
  btrfs: Add qgroup tracing
  Btrfs: don't use src fd for printk
  btrfs: fallback to vmalloc in btrfs_compare_tree
  btrfs: handle non-fatal errors in btrfs_qgroup_inherit()
  btrfs: Output more info for enospc_debug mount option
  Btrfs: fix invalid reference in replace_path
  Btrfs: Improve FL_KEEP_SIZE handling in fallocate
---

839a3f765728cdca0057a12e2dc0bf669ac1c22e